From 11169c0e71ac841db5dded6b14f6460d35eef56a Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 2 Dec 2008 11:40:22 +0000
Subject: 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.

---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 +-
 OpenSim/Grid/GridServer/GridServerBase.cs      | 2 +-
 OpenSim/Grid/MessagingServer/Main.cs           | 2 +-
 OpenSim/Grid/UserServer/Main.cs                | 2 +-
 OpenSim/Grid/UserServer/UserManager.cs         | 1 -
 OpenSim/Region/Application/OpenSimBase.cs      | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 302640b..ca6ef67 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Servers
         /// <summary>
         /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
         /// </summary>      
-        protected virtual void ShutdownSpecific() {}
+        public virtual void ShutdownSpecific() {}
 
         /// <summary>
         /// Print statistics to the logfile, if they are active
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);
         }   
-
     }
 }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 75bdcf3..3dba20f 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -557,7 +557,7 @@ namespace OpenSim
         /// <summary>
         /// Performs any last-minute sanity checking and shuts down the region server
         /// </summary>
-        protected override void ShutdownSpecific()
+        public override void ShutdownSpecific()
         {
             if (proxyUrl.Length > 0)
             {
-- 
cgit v1.1