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/MessagingServer/Main.cs | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'OpenSim/Grid/MessagingServer') diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index bf793bf..22a7d9c 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs @@ -140,29 +140,13 @@ namespace OpenSim.Grid.MessagingServer // m_lastCreatedUser = userID; break; } - } + } - public override void RunCmd(string cmd, string[] cmdparams) + protected override void Shutdown() { - base.RunCmd(cmd, cmdparams); + msgsvc.deregisterWithUserServer(); - switch (cmd) - { - case "help": - m_console.Notice("shutdown - shutdown the message server (USE CAUTION!)"); - break; - - case "shutdown": - msgsvc.deregisterWithUserServer(); - m_console.Close(); - Environment.Exit(0); - break; - } - } - - public override void Show(string ShowWhat) - { - base.Show(ShowWhat); + base.Shutdown(); } } } -- cgit v1.1