aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneManager.cs
diff options
context:
space:
mode:
authorMelanie2012-07-28 01:06:28 +0100
committerMelanie2012-07-28 01:06:28 +0100
commit45b72bf01c99697e65b6cda5515bbadc4a9442da (patch)
tree80d6d65917c2c26b2dce46755acefc25109df129 /OpenSim/Region/Framework/Scenes/SceneManager.cs
parentAdd master's new binaries (diff)
downloadopensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.zip
opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.tar.gz
opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.tar.bz2
opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.tar.xz
Fix some merge issues and a functional issue in the scene manager
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneManager.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index a412414..f1b09ca 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes
192 private void HandleRegionReadyStatusChange(IScene scene) 192 private void HandleRegionReadyStatusChange(IScene scene)
193 { 193 {
194 lock (m_localScenes) 194 lock (m_localScenes)
195 AllRegionsReady = m_localScenes.TrueForAll(s => s.Ready); 195 AllRegionsReady = m_localScenes.FindAll(s => !s.Ready).Count == 0;
196 } 196 }
197 197
198 public void SendSimOnlineNotification(ulong regionHandle) 198 public void SendSimOnlineNotification(ulong regionHandle)