aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base/ServicesServerBase.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-24 22:35:55 +0000
committerJustin Clark-Casey (justincc)2012-01-24 22:35:55 +0000
commit2d0412d366c1c243cc3abfe753f21d59b4c55473 (patch)
treedb1d27ecebbb66838e918aa30080176991c96723 /OpenSim/Server/Base/ServicesServerBase.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-2d0412d366c1c243cc3abfe753f21d59b4c55473.zip
opensim-SC_OLD-2d0412d366c1c243cc3abfe753f21d59b4c55473.tar.gz
opensim-SC_OLD-2d0412d366c1c243cc3abfe753f21d59b4c55473.tar.bz2
opensim-SC_OLD-2d0412d366c1c243cc3abfe753f21d59b4c55473.tar.xz
Make errors reported by OpenSim when it halts because it can't find certain config sections or files a bit more user friendly.
Diffstat (limited to 'OpenSim/Server/Base/ServicesServerBase.cs')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index aeba35f..a6f4e47 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -126,11 +126,10 @@ namespace OpenSim.Server.Base
126 m_Config = new IniConfigSource(iniFile); 126 m_Config = new IniConfigSource(iniFile);
127 } 127 }
128 } 128 }
129 catch (Exception) 129 catch (Exception e)
130 { 130 {
131 System.Console.WriteLine("Error reading from config source {0}", 131 System.Console.WriteLine("Error reading from config source. {0}", e.Message);
132 iniFile); 132 Environment.Exit(1);
133 Thread.CurrentThread.Abort();
134 } 133 }
135 134
136 // Merge the configuration from the command line into the 135 // Merge the configuration from the command line into the