aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorDiva Canto2017-04-26 09:58:34 -0700
committerDiva Canto2017-04-26 09:58:34 -0700
commitc8fcf9bceb0a088a1b212d7a2b0739e92618e616 (patch)
tree767f0ba5c94a2682b974cc598bc981e5e6a73757 /OpenSim/Framework/Servers
parentFill out Current Outfit folder with links when creating the initial avatar ap... (diff)
parentgive more information on Fatal Error during region startup (diff)
downloadopensim-SC_OLD-c8fcf9bceb0a088a1b212d7a2b0739e92618e616.zip
opensim-SC_OLD-c8fcf9bceb0a088a1b212d7a2b0739e92618e616.tar.gz
opensim-SC_OLD-c8fcf9bceb0a088a1b212d7a2b0739e92618e616.tar.bz2
opensim-SC_OLD-c8fcf9bceb0a088a1b212d7a2b0739e92618e616.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index f761813..62cd543 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -163,8 +163,7 @@ namespace OpenSim.Framework.Servers
163 } 163 }
164 catch(Exception e) 164 catch(Exception e)
165 { 165 {
166 m_log.FatalFormat("Fatal error: {0}", 166 m_log.Fatal("Fatal error: " + e.ToString());
167 (e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message );
168 Environment.Exit(1); 167 Environment.Exit(1);
169 } 168 }
170 169