diff options
| author | Melanie | 2012-01-25 00:45:57 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-25 00:45:57 +0000 |
| commit | 427ab55058128c3cebd5ebd5e3aed93bc4337a2b (patch) | |
| tree | e50bf3ef199b3aeb208ce3cabbd242e10e65c8ca /OpenSim/Server | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make errors reported by OpenSim when it halts because it can't find certain c... (diff) | |
| download | opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.zip opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.tar.gz opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.tar.bz2 opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 7 |
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 |