ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

try fix osx detection than ms keeps breaking

Browse Source
This commit is contained in:
UbitUmarov
2022-11-16 00:20:37 +00:00
parent 18e20d6fdd
commit 8685ebe655
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@@ -187,7 +187,7 @@ namespace OpenSim.Framework.Servers
m_log.Info("[STARTUP]: version: " + m_version);
m_log.InfoFormat("[STARTUP]: Operating system version: {0}, .NET platform {1}, Runtime {2}",
Environment.OSVersion, Environment.OSVersion.Platform, Environment.Version.ToString());
Environment.OSVersion, Util.RuntimePlatformStr, Environment.Version.ToString());
m_log.InfoFormat("[STARTUP]: Processor Architecture: {0}({1} {2}bit)",
RuntimeInformation.ProcessArchitecture.ToString(),
BitConverter.IsLittleEndian ?"le":"be", Environment.Is64BitProcess ? "64" : "32");

2
OpenSim/Framework/Servers/ServerBase.cs
View File

@@ -140,7 +140,7 @@ namespace OpenSim.Framework.Servers
//m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
m_log.InfoFormat(
"[SERVER BASE]: Operating system version: {0}, .NET platform {1}, {2}-bit",
Environment.OSVersion, Environment.OSVersion.Platform, Environment.Is64BitProcess ? "64" : "32");
Environment.OSVersion, Util.RuntimePlatformStr, Environment.Is64BitProcess ? "64" : "32");
}
public void RegisterCommonAppenders(IConfig startupConfig)

14
OpenSim/Framework/Util.cs
View File

@@ -2308,15 +2308,17 @@ namespace OpenSim.Framework
//return os;
}
public static string GetRuntimeInformation()
{
return RuntimeInformation.ProcessArchitecture.ToString() + "/" + Environment.OSVersion.Platform switch
public static readonly string RuntimeInformationStr = RuntimeInformation.ProcessArchitecture.ToString() + "/" + Environment.OSVersion.Platform switch
{
PlatformID.MacOSX => "OSX/DotNet",
PlatformID.Unix => "Unix/DotNet",
PlatformID.MacOSX or PlatformID.Unix => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "OSX/DotNet" : "Unix/DotNet",
_ => "Win/DotNet",
};
public static readonly string RuntimePlatformStr = Environment.OSVersion.Platform switch
{
PlatformID.MacOSX or PlatformID.Unix => RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "OSX/DotNet" : "Unix/DotNet",
_ => "Win/DotNet",
};
}
/// <summary>
/// Is the given string a UUID?

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -875,7 +875,7 @@ namespace OpenSim.Region.Framework.Scenes
PhysicsEnabled = !RegionInfo.RegionSettings.DisablePhysics;
m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")";
m_simulatorVersion = simulatorVersion + " (" + Util.RuntimeInformationStr + ")";
#region Region Config