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

bad merge

Browse Source
This commit is contained in:
UbitUmarov
2025-06-25 02:32:13 +01:00
parent 209ca3f861
commit 27cd53112c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Application/Application.cs
View File

@@ -78,7 +78,6 @@ namespace OpenSim
AppContext.SetSwitch("System.Drawing.EnableUnixSupport", true);
// pre load System.Drawing.Common.dll for the platform
// this will fail if a newer version is present on GAC, bin folder, etc, since LoadFrom only accepts the path, if it cannot find it elsewhere
string targetdll = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),"lib",
@@ -92,7 +91,7 @@ namespace OpenSim
m_log.Error("Failed to load System.Drawing.Common.dll for current platform" + e.Message);
throw;
}
*/
string targetdll = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
"System.Drawing.Common.dll");
string src = targetdll + (Util.IsWindows() ? ".win" : ".linux");
@@ -126,7 +125,7 @@ namespace OpenSim
// Configure Log4Net
configSource.AddSwitch("Startup", "logconfig");
string logConfigFile = configSource.Configs["Startup"].GetString("logconfig", String.Empty);
string logConfigFile = configSource.Configs["Startup"].GetString("logconfig", string.Empty);
if (!string.IsNullOrEmpty(logConfigFile))
{
XmlConfigurator.Configure(new System.IO.FileInfo(logConfigFile));