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/Grid/UserServer/Main.cs | 2 +- OpenSim/Grid/UserServer/UserManager.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'OpenSim/Grid/UserServer') 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); } - } } -- cgit v1.1