diff options
* Fixed neighbour range bug
* Various refactorings
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneManager.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index ed33bf7..52b06f0 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs | |||
@@ -93,12 +93,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
93 | 93 | ||
94 | public void Add(Scene scene) | 94 | public void Add(Scene scene) |
95 | { | 95 | { |
96 | scene.OnRestart += handleRestart; | 96 | scene.OnRestart += HandleRestart; |
97 | m_localScenes.Add(scene); | 97 | m_localScenes.Add(scene); |
98 | 98 | ||
99 | } | 99 | } |
100 | 100 | ||
101 | public void handleRestart(RegionInfo rdata) | 101 | public void HandleRestart(RegionInfo rdata) |
102 | { | 102 | { |
103 | MainLog.Instance.Error("SCENEMANAGER", "Got Restart message for region:" + rdata.RegionName +" Sending up to main"); | 103 | MainLog.Instance.Error("SCENEMANAGER", "Got Restart message for region:" + rdata.RegionName +" Sending up to main"); |
104 | int RegionSceneElement = -1; | 104 | int RegionSceneElement = -1; |
@@ -106,14 +106,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
106 | { | 106 | { |
107 | 107 | ||
108 | if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName) | 108 | if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName) |
109 | { | ||
109 | RegionSceneElement = i; | 110 | RegionSceneElement = i; |
111 | } | ||
110 | } | 112 | } |
111 | 113 | ||
112 | // Now we make sure the region is no longer known about by the SceneManager | 114 | // Now we make sure the region is no longer known about by the SceneManager |
113 | // Prevents Duplicates. | 115 | // Prevents Duplicates. |
114 | 116 | ||
115 | if (RegionSceneElement >= 0) | 117 | if (RegionSceneElement >= 0) |
118 | { | ||
116 | m_localScenes.RemoveAt(RegionSceneElement); | 119 | m_localScenes.RemoveAt(RegionSceneElement); |
120 | } | ||
117 | 121 | ||
118 | // Send signal to main that we're restarting this sim. | 122 | // Send signal to main that we're restarting this sim. |
119 | OnReStartSim(rdata); | 123 | OnReStartSim(rdata); |
@@ -216,7 +220,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
216 | 220 | ||
217 | public void RestartCurrentScene() | 221 | public void RestartCurrentScene() |
218 | { | 222 | { |
219 | ForEachCurrentScene(delegate(Scene scene) { scene.restartNOW(); }); | 223 | ForEachCurrentScene(delegate(Scene scene) { scene.RestartNow(); }); |
220 | 224 | ||
221 | } | 225 | } |
222 | 226 | ||