From a47176ee9287cc2802007e9cd1eb15e2a0b04906 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 6 Dec 2007 17:41:21 +0000 Subject: more minor cleanup. added some command descriptions to region server help. --- OpenSim/Region/Environment/Scenes/SceneManager.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes') 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; namespace OpenSim.Region.Environment.Scenes { - public delegate void ReStartSim(RegionInfo thisregion); + public delegate void RestartSim(RegionInfo thisregion); public class SceneManager { - public event ReStartSim OnReStartSim; + public event RestartSim OnRestartSim; private readonly List m_localScenes; private Scene m_currentScene = null; @@ -103,7 +103,6 @@ namespace OpenSim.Region.Environment.Scenes int RegionSceneElement = -1; for (int i = 0; i < m_localScenes.Count; i++) { - if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName) { RegionSceneElement = i; @@ -111,7 +110,7 @@ namespace OpenSim.Region.Environment.Scenes } // Now we make sure the region is no longer known about by the SceneManager - // Prevents Duplicates. + // Prevents duplicates. if (RegionSceneElement >= 0) { @@ -119,7 +118,7 @@ namespace OpenSim.Region.Environment.Scenes } // Send signal to main that we're restarting this sim. - OnReStartSim(rdata); + OnRestartSim(rdata); } public void SendSimOnlineNotification(ulong regionHandle) @@ -131,7 +130,6 @@ namespace OpenSim.Region.Environment.Scenes if (m_localScenes[i].RegionInfo.RegionHandle == regionHandle) { - // Inform other regions to tell their avatar about me Result = m_localScenes[i].RegionInfo; } @@ -140,10 +138,8 @@ namespace OpenSim.Region.Environment.Scenes { for (int i = 0; i < m_localScenes.Count; i++) { - if (m_localScenes[i].RegionInfo.RegionHandle != regionHandle) { - // Inform other regions to tell their avatar about me //m_localScenes[i].OtherRegionUp(Result); } @@ -221,7 +217,6 @@ namespace OpenSim.Region.Environment.Scenes public void RestartCurrentScene() { ForEachCurrentScene(delegate(Scene scene) { scene.RestartNow(); }); - } public void BackupCurrentScene() -- cgit v1.1