From 170cb935cdfcbd0f3a085f93f5b4aaa66083d888 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 3 Oct 2008 16:06:00 +0000
Subject: * refactor: make shutdown a template method in the same manner as
 startup, for consistency's sake

---
 OpenSim/Grid/GridServer/GridServerBase.cs | 4 +---
 OpenSim/Grid/MessagingServer/Main.cs      | 4 +---
 OpenSim/Grid/UserServer/Main.cs           | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Grid')

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 5067a8c..875b4ac 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -167,11 +167,9 @@ namespace OpenSim.Grid.GridServer
             */
         }
 
-        public override void Shutdown()
+        protected override void ShutdownSpecific()
         {
             foreach (IGridPlugin plugin in m_plugins) plugin.Dispose();
-
-            base.Shutdown();
         }
     }
 }
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 27b9346..537cc48 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -160,11 +160,9 @@ namespace OpenSim.Grid.MessagingServer
             m_console.Notice("clear-cache - Clears region cache.  Should be done when regions change position.  The region cache gets stale after a while.");
         }
 
-        public override void Shutdown()
+        protected override void ShutdownSpecific()
         {
             msgsvc.deregisterWithUserServer();
-
-            base.Shutdown();
         }
     }
 }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 23df830..e24b486 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -392,11 +392,9 @@ namespace OpenSim.Grid.UserServer
             
         }
 
-        public override void Shutdown()
+        protected override void ShutdownSpecific()
         {
             m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
-          
-            base.Shutdown();
         }
 
         public void TestResponse(List<InventoryFolderBase> resp)
-- 
cgit v1.1