diff options
| author | UbitUmarov | 2016-07-27 23:39:50 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-07-27 23:39:50 +0100 |
| commit | 376084a2e52561cfd1b359aabe9bb64ecc84c2fc (patch) | |
| tree | 77052f68f03eb426b35fc7bd584eeadf9a4b34cf /OpenSim/Framework/Servers | |
| parent | add another gatekeeper login fail reason reply (diff) | |
| parent | first step removing MegaRegions: refuse to run. Thanks to all that made MegaR... (diff) | |
| download | opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.zip opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.gz opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.bz2 opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 3426d10..1d4deac 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -157,7 +157,16 @@ namespace OpenSim.Framework.Servers | |||
| 157 | "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n", | 157 | "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n", |
| 158 | Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); | 158 | Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); |
| 159 | 159 | ||
| 160 | StartupSpecific(); | 160 | try |
| 161 | { | ||
| 162 | StartupSpecific(); | ||
| 163 | } | ||
| 164 | catch(Exception e) | ||
| 165 | { | ||
| 166 | m_log.FatalFormat("Fatal error: {0}", | ||
| 167 | (e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message ); | ||
| 168 | Environment.Exit(1); | ||
| 169 | } | ||
| 161 | 170 | ||
| 162 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 171 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
| 163 | 172 | ||