diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index a42000a29e..f68f511385 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -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));