aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorMW2008-12-02 11:40:22 +0000
committerMW2008-12-02 11:40:22 +0000
commit11169c0e71ac841db5dded6b14f6460d35eef56a (patch)
tree008b0610a428a8913be48ff8f6f79576f3c52b85 /OpenSim/Grid/UserServer
parentAdded two new "trusted" url handlers to the Inventory server, to allow the us... (diff)
downloadopensim-SC-11169c0e71ac841db5dded6b14f6460d35eef56a.zip
opensim-SC-11169c0e71ac841db5dded6b14f6460d35eef56a.tar.gz
opensim-SC-11169c0e71ac841db5dded6b14f6460d35eef56a.tar.bz2
opensim-SC-11169c0e71ac841db5dded6b14f6460d35eef56a.tar.xz
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.
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs1
2 files changed, 1 insertions, 2 deletions
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
415 415
416 } 416 }
417 417
418 protected override void ShutdownSpecific() 418 public override void ShutdownSpecific()
419 { 419 {
420 m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation; 420 m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
421 } 421 }
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
816 { 816 {
817 LogoutUsers(regionID); 817 LogoutUsers(regionID);
818 } 818 }
819
820 } 819 }
821} 820}