Made BaseOpenSimServer.ShutdownSpecific() public. As the OpenSimBase.Shutdown() includes a Environment.Exit(0); which is not always wanted when shutting down, like from a windows service.

4 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 9652765..68edbd2 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -195,7 +195,7 @@ namespace OpenSim.Grid.GridServer
             */
         }
 
-        protected override void ShutdownSpecific()
+        public override void ShutdownSpecific()
         {
             foreach (IGridPlugin plugin in m_plugins) plugin.Dispose();
         }
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index d683d5b..e83da7a 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Grid.MessagingServer
             m_console.Notice("register    - (Re-)registers with user-server. This might be necessary if the userserver crashed/restarted"); 
         }
 
-        protected override void ShutdownSpecific()
+        public override void ShutdownSpecific()
         {
             msgsvc.deregisterWithUserServer();
         }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 6d7a331..4fc5815 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -415,7 +415,7 @@ namespace OpenSim.Grid.UserServer
             
         }
 
-        protected override void ShutdownSpecific()
+        public override void ShutdownSpecific()
         {
             m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
         }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 377ff3a..65e19b2 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -816,6 +816,5 @@ namespace OpenSim.Grid.UserServer
         {
             LogoutUsers(regionID);
         }   
-
     }
 }