zontreck/OpenSim-Sasquatch
1
0
Fork 0
mirror of https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git synced 2024-11-21 06:26:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename Develop to Tranquillity.sln. Repo has halso been renamed as well.
Some checks failed
CodeQL / Analyze (push) Has been cancelled
Details
dotnet package / build (8.0.x) (push) Has been cancelled
Details
dotnet package / build (9.0.x) (push) Has been cancelled
Details

Browse source 
Remove hack changes for System.Drawing.  We're going to replace that on a branch.
This commit is contained in:
Michael Dickson 2024-10-17 00:18:17 -04:00
parent 580ffb5b6a
commit 1f976e5120
5 changed files with 2 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Source/OpenSim.Server.RegionServer/Application.cs
View file

@ -73,8 +73,6 @@ namespace OpenSim
// First line, hook the appdomain to the crash reporter
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
System.AppContext.SetSwitch("System.Drawing.EnableUnixSupport", true);
Culture.SetCurrentCulture();
Culture.SetDefaultCurrentCulture();
@ -103,30 +101,8 @@ namespace OpenSim
m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.Server.RegionServer.dll.config");
}
// temporay set the platform dependent System.Drawing.Common.dll
string targetdll = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
"System.Drawing.Common.dll");
string src = targetdll + (Util.IsWindows() ? ".win" : ".linux");
try
{
if (!File.Exists(targetdll))
File.Copy(src, targetdll);
else
{
FileInfo targetInfo = new(targetdll);
FileInfo srcInfo = new(src);
if(targetInfo.Length != srcInfo.Length)
File.Copy(src, targetdll, true);
}
}
catch (Exception e)
{
m_log.Error("Failed to copy System.Drawing.Common.dll for current platform" + e.Message);
throw;
}
m_log.InfoFormat("[OPENSIM MAIN]: System Locale is {0}", System.Threading.Thread.CurrentThread.CurrentCulture);
m_log.InfoFormat(
"[OPENSIM MAIN]: System Locale is {0}", System.Threading.Thread.CurrentThread.CurrentCulture);
if(!Util.IsWindows())
{
string monoThreadsPerCpu = System.Environment.GetEnvironmentVariable("MONO_THREADS_PER_CPU");

14
Source/OpenSim.Server.RegionServer/OpenSim.Server.RegionServer.csproj
View file

@ -45,20 +45,6 @@
<ProjectReference Include="..\OpenSim.Services.UserAccountService\OpenSim.Services.UserAccountService.csproj" />
</ItemGroup>
<!-- This is a hack. System.Drawing needs to be retired. -->
<ItemGroup>
<None Include="$(SolutionDir)\bin\System.Drawing.Common.dll.win">
<TargetPath>%(FileName)%(Extension)</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="$(SolutionDir)\bin\System.Drawing.Common.dll.linux">
<TargetPath>%(FileName)%(Extension)</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="Data\**\*">
<TargetPath>%(RecursiveDir)%(FileName)%(Extension)</TargetPath>

16
Source/OpenSim.Server.RobustServer/OpenSim.Server.RobustServer.csproj
View file

@ -37,20 +37,6 @@
<ProjectReference Include="..\OpenSim.Services.LLLoginService\OpenSim.Services.LLLoginService.csproj" />
</ItemGroup>
<!-- This is a hack. System.Drawing needs to be retired. -->
<ItemGroup>
<None Include="$(SolutionDir)\bin\System.Drawing.Common.dll.win">
<TargetPath>%(FileName)%(Extension)</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="$(SolutionDir)\bin\System.Drawing.Common.dll.linux">
<TargetPath>%(FileName)%(Extension)</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="Data\**\*">
<TargetPath>%(RecursiveDir)%(FileName)%(Extension)</TargetPath>
@ -61,7 +47,7 @@
<ItemGroup>
<PackageReference Include="log4net" Version="3.0.1" />
<PackageReference Include="Mono.Addins" Version="1.4.1" />
<PackageReference Include="Mono.Addins.Setup" Version="1.4.1" />
<PackageReference Include="Mono.Addins.Setup" Version="1.4.1" />
<PackageReference Include="Mono.Addins.CecilReflector" Version="1.4.1" />
</ItemGroup>
</Project>

23
Source/OpenSim.Server.RobustServer/ServerMain.cs
View file

@ -142,29 +142,6 @@ namespace OpenSim.Server
connList = string.Join(",", servicesList.ToArray());
}
// temporay set the platform dependent System.Drawing.Common.dll
string targetdll = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
"System.Drawing.Common.dll");
string src = targetdll + (Util.IsWindows() ? ".win" : ".linux");
try
{
if (!File.Exists(targetdll))
File.Copy(src, targetdll);
else
{
FileInfo targetInfo = new(targetdll);
FileInfo srcInfo = new(src);
if (targetInfo.Length != srcInfo.Length)
File.Copy(src, targetdll, true);
}
}
catch (Exception e)
{
m_log.Error("Failed to copy System.Drawing.Common.dll for current platform" + e.Message);
throw;
}
string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'});
foreach (string c in conns)

0
OpenSim.sln → Tranquillity.sln
View file