aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-07 16:24:15 +0000
committerJustin Clarke Casey2008-05-07 16:24:15 +0000
commit250fb6f5dbcd6665c2783db08389b7e5ce698d5e (patch)
treece50e5ed7f0709cd2f819ad3c4eca63338407463 /OpenSim/Grid/UserServer
parentThank you very much, Xantor for a patch to improve (diff)
downloadopensim-SC_OLD-250fb6f5dbcd6665c2783db08389b7e5ce698d5e.zip
opensim-SC_OLD-250fb6f5dbcd6665c2783db08389b7e5ce698d5e.tar.gz
opensim-SC_OLD-250fb6f5dbcd6665c2783db08389b7e5ce698d5e.tar.bz2
opensim-SC_OLD-250fb6f5dbcd6665c2783db08389b7e5ce698d5e.tar.xz
* Move shutdown processing to base OpenSimServer, overriding the method where appropriate
* This also means that the command quit (as well as shutdown) will now close down grid servers (instead of only being in place for the region server)
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 8e6559c..d60c205 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -219,19 +219,12 @@ namespace OpenSim.Grid.UserServer
219 { 219 {
220 case "help": 220 case "help":
221 m_console.Notice("create user - create a new user"); 221 m_console.Notice("create user - create a new user");
222 m_console.Notice("stats - statistical information for this server"); 222 m_console.Notice("stats - statistical information for this server");
223 m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
224 break; 223 break;
225 224
226 case "create": 225 case "create":
227 do_create(cmdparams[0]); 226 do_create(cmdparams[0]);
228 break; 227 break;
229
230 case "shutdown":
231 m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
232 m_console.Close();
233 Environment.Exit(0);
234 break;
235 228
236 case "stats": 229 case "stats":
237 m_console.Notice(StatsManager.UserStats.Report()); 230 m_console.Notice(StatsManager.UserStats.Report());
@@ -251,6 +244,13 @@ namespace OpenSim.Grid.UserServer
251 } 244 }
252 } 245 }
253 246
247 protected override void Shutdown()
248 {
249 m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
250
251 base.Shutdown();
252 }
253
254 public void TestResponse(List<InventoryFolderBase> resp) 254 public void TestResponse(List<InventoryFolderBase> resp)
255 { 255 {
256 m_console.Notice("response got"); 256 m_console.Notice("response got");