aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneManager.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs13
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 3f88617..c589e8d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -34,11 +34,11 @@ using OpenSim.Framework.Console;
34 34
35namespace OpenSim.Region.Environment.Scenes 35namespace OpenSim.Region.Environment.Scenes
36{ 36{
37 public delegate void ReStartSim(RegionInfo thisregion); 37 public delegate void RestartSim(RegionInfo thisregion);
38 38
39 public class SceneManager 39 public class SceneManager
40 { 40 {
41 public event ReStartSim OnReStartSim; 41 public event RestartSim OnRestartSim;
42 42
43 private readonly List<Scene> m_localScenes; 43 private readonly List<Scene> m_localScenes;
44 private Scene m_currentScene = null; 44 private Scene m_currentScene = null;
@@ -103,7 +103,6 @@ namespace OpenSim.Region.Environment.Scenes
103 int RegionSceneElement = -1; 103 int RegionSceneElement = -1;
104 for (int i = 0; i < m_localScenes.Count; i++) 104 for (int i = 0; i < m_localScenes.Count; i++)
105 { 105 {
106
107 if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName) 106 if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName)
108 { 107 {
109 RegionSceneElement = i; 108 RegionSceneElement = i;
@@ -111,7 +110,7 @@ namespace OpenSim.Region.Environment.Scenes
111 } 110 }
112 111
113 // Now we make sure the region is no longer known about by the SceneManager 112 // Now we make sure the region is no longer known about by the SceneManager
114 // Prevents Duplicates. 113 // Prevents duplicates.
115 114
116 if (RegionSceneElement >= 0) 115 if (RegionSceneElement >= 0)
117 { 116 {
@@ -119,7 +118,7 @@ namespace OpenSim.Region.Environment.Scenes
119 } 118 }
120 119
121 // Send signal to main that we're restarting this sim. 120 // Send signal to main that we're restarting this sim.
122 OnReStartSim(rdata); 121 OnRestartSim(rdata);
123 } 122 }
124 123
125 public void SendSimOnlineNotification(ulong regionHandle) 124 public void SendSimOnlineNotification(ulong regionHandle)
@@ -131,7 +130,6 @@ namespace OpenSim.Region.Environment.Scenes
131 130
132 if (m_localScenes[i].RegionInfo.RegionHandle == regionHandle) 131 if (m_localScenes[i].RegionInfo.RegionHandle == regionHandle)
133 { 132 {
134
135 // Inform other regions to tell their avatar about me 133 // Inform other regions to tell their avatar about me
136 Result = m_localScenes[i].RegionInfo; 134 Result = m_localScenes[i].RegionInfo;
137 } 135 }
@@ -140,10 +138,8 @@ namespace OpenSim.Region.Environment.Scenes
140 { 138 {
141 for (int i = 0; i < m_localScenes.Count; i++) 139 for (int i = 0; i < m_localScenes.Count; i++)
142 { 140 {
143
144 if (m_localScenes[i].RegionInfo.RegionHandle != regionHandle) 141 if (m_localScenes[i].RegionInfo.RegionHandle != regionHandle)
145 { 142 {
146
147 // Inform other regions to tell their avatar about me 143 // Inform other regions to tell their avatar about me
148 //m_localScenes[i].OtherRegionUp(Result); 144 //m_localScenes[i].OtherRegionUp(Result);
149 } 145 }
@@ -221,7 +217,6 @@ namespace OpenSim.Region.Environment.Scenes
221 public void RestartCurrentScene() 217 public void RestartCurrentScene()
222 { 218 {
223 ForEachCurrentScene(delegate(Scene scene) { scene.RestartNow(); }); 219 ForEachCurrentScene(delegate(Scene scene) { scene.RestartNow(); });
224
225 } 220 }
226 221
227 public void BackupCurrentScene() 222 public void BackupCurrentScene()