diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
6 files changed, 5 insertions, 6 deletions
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 | |||
103 | /// <summary> | 103 | /// <summary> |
104 | /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing | 104 | /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing |
105 | /// </summary> | 105 | /// </summary> |
106 | protected virtual void ShutdownSpecific() {} | 106 | public virtual void ShutdownSpecific() {} |
107 | 107 | ||
108 | /// <summary> | 108 | /// <summary> |
109 | /// Print statistics to the logfile, if they are active | 109 | /// 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 | |||
195 | */ | 195 | */ |
196 | } | 196 | } |
197 | 197 | ||
198 | protected override void ShutdownSpecific() | 198 | public override void ShutdownSpecific() |
199 | { | 199 | { |
200 | foreach (IGridPlugin plugin in m_plugins) plugin.Dispose(); | 200 | foreach (IGridPlugin plugin in m_plugins) plugin.Dispose(); |
201 | } | 201 | } |
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 | |||
179 | m_console.Notice("register - (Re-)registers with user-server. This might be necessary if the userserver crashed/restarted"); | 179 | m_console.Notice("register - (Re-)registers with user-server. This might be necessary if the userserver crashed/restarted"); |
180 | } | 180 | } |
181 | 181 | ||
182 | protected override void ShutdownSpecific() | 182 | public override void ShutdownSpecific() |
183 | { | 183 | { |
184 | msgsvc.deregisterWithUserServer(); | 184 | msgsvc.deregisterWithUserServer(); |
185 | } | 185 | } |
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 | } |
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 | |||
557 | /// <summary> | 557 | /// <summary> |
558 | /// Performs any last-minute sanity checking and shuts down the region server | 558 | /// Performs any last-minute sanity checking and shuts down the region server |
559 | /// </summary> | 559 | /// </summary> |
560 | protected override void ShutdownSpecific() | 560 | public override void ShutdownSpecific() |
561 | { | 561 | { |
562 | if (proxyUrl.Length > 0) | 562 | if (proxyUrl.Length > 0) |
563 | { | 563 | { |