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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
This commit is contained in:
Melanie
2012-01-25 00:45:57 +00:00
parent 18fd36cba4 2d0412d366
commit 427ab55058
10 changed files with 184 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Server/Base/ServicesServerBase.cs
View File

@@ -126,11 +126,10 @@ namespace OpenSim.Server.Base
m_Config = new IniConfigSource(iniFile);
}
}
catch (Exception)
catch (Exception e)
{
System.Console.WriteLine("Error reading from config source {0}",
iniFile);
Thread.CurrentThread.Abort();
System.Console.WriteLine("Error reading from config source. {0}", e.Message);
Environment.Exit(1);
}
// Merge the configuration from the command line into the