aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/ServerMain.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-31 21:00:09 +0000
committerMelanie Thielker2009-07-31 21:00:09 +0000
commitff35a3378edd4a1885cb41f44f91d546d6818139 (patch)
treec6a1463bd09554d793105847770bad36465c59be /OpenSim/Server/ServerMain.cs
parent* Fix a locking issue in the EventQueue (diff)
downloadopensim-SC_OLD-ff35a3378edd4a1885cb41f44f91d546d6818139.zip
opensim-SC_OLD-ff35a3378edd4a1885cb41f44f91d546d6818139.tar.gz
opensim-SC_OLD-ff35a3378edd4a1885cb41f44f91d546d6818139.tar.bz2
opensim-SC_OLD-ff35a3378edd4a1885cb41f44f91d546d6818139.tar.xz
Make ROBUST not hang on exit in recent Mono versions. Make the logfile config
setting/commandline option actually work.
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/ServerMain.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 80b763c..77dfebb 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -87,7 +87,11 @@ namespace OpenSim.Server
87 m_log.InfoFormat("[SERVER]: Failed to load {0}", conn); 87 m_log.InfoFormat("[SERVER]: Failed to load {0}", conn);
88 } 88 }
89 } 89 }
90 return m_Server.Run(); 90 int res = m_Server.Run();
91
92 Environment.Exit(res);
93
94 return 0;
91 } 95 }
92 } 96 }
93} 97}