diff options
author | Justin Clarke Casey | 2008-10-03 16:06:00 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-03 16:06:00 +0000 |
commit | 170cb935cdfcbd0f3a085f93f5b4aaa66083d888 (patch) | |
tree | 2c10c321ef0777b58517b13e1478a4997baf6aea /OpenSim/Grid | |
parent | * minor: restore the standard startup logo text now I understand why things w... (diff) | |
download | opensim-SC_OLD-170cb935cdfcbd0f3a085f93f5b4aaa66083d888.zip opensim-SC_OLD-170cb935cdfcbd0f3a085f93f5b4aaa66083d888.tar.gz opensim-SC_OLD-170cb935cdfcbd0f3a085f93f5b4aaa66083d888.tar.bz2 opensim-SC_OLD-170cb935cdfcbd0f3a085f93f5b4aaa66083d888.tar.xz |
* refactor: make shutdown a template method in the same manner as startup, for consistency's sake
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/Main.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index 5067a8c..875b4ac 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -167,11 +167,9 @@ namespace OpenSim.Grid.GridServer | |||
167 | */ | 167 | */ |
168 | } | 168 | } |
169 | 169 | ||
170 | public override void Shutdown() | 170 | protected override void ShutdownSpecific() |
171 | { | 171 | { |
172 | foreach (IGridPlugin plugin in m_plugins) plugin.Dispose(); | 172 | foreach (IGridPlugin plugin in m_plugins) plugin.Dispose(); |
173 | |||
174 | base.Shutdown(); | ||
175 | } | 173 | } |
176 | } | 174 | } |
177 | } | 175 | } |
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index 27b9346..537cc48 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs | |||
@@ -160,11 +160,9 @@ namespace OpenSim.Grid.MessagingServer | |||
160 | m_console.Notice("clear-cache - Clears region cache. Should be done when regions change position. The region cache gets stale after a while."); | 160 | m_console.Notice("clear-cache - Clears region cache. Should be done when regions change position. The region cache gets stale after a while."); |
161 | } | 161 | } |
162 | 162 | ||
163 | public override void Shutdown() | 163 | protected override void ShutdownSpecific() |
164 | { | 164 | { |
165 | msgsvc.deregisterWithUserServer(); | 165 | msgsvc.deregisterWithUserServer(); |
166 | |||
167 | base.Shutdown(); | ||
168 | } | 166 | } |
169 | } | 167 | } |
170 | } | 168 | } |
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 23df830..e24b486 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -392,11 +392,9 @@ namespace OpenSim.Grid.UserServer | |||
392 | 392 | ||
393 | } | 393 | } |
394 | 394 | ||
395 | public override void Shutdown() | 395 | protected override void ShutdownSpecific() |
396 | { | 396 | { |
397 | m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation; | 397 | m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation; |
398 | |||
399 | base.Shutdown(); | ||
400 | } | 398 | } |
401 | 399 | ||
402 | public void TestResponse(List<InventoryFolderBase> resp) | 400 | public void TestResponse(List<InventoryFolderBase> resp) |