From 250fb6f5dbcd6665c2783db08389b7e5ce698d5e Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 7 May 2008 16:24:15 +0000 Subject: * 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) --- OpenSim/Grid/UserServer/Main.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Grid/UserServer/Main.cs') 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 { case "help": m_console.Notice("create user - create a new user"); - m_console.Notice("stats - statistical information for this server"); - m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)"); + m_console.Notice("stats - statistical information for this server"); break; case "create": do_create(cmdparams[0]); break; - - case "shutdown": - m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation; - m_console.Close(); - Environment.Exit(0); - break; case "stats": m_console.Notice(StatsManager.UserStats.Report()); @@ -251,6 +244,13 @@ namespace OpenSim.Grid.UserServer } } + protected override void Shutdown() + { + m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation; + + base.Shutdown(); + } + public void TestResponse(List resp) { m_console.Notice("response got"); -- cgit v1.1