aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-11-23 02:03:44 +0000
committerMelanie2012-11-23 02:03:44 +0000
commitb09fb01571f97643fd66a32a1fe75fc45863cc73 (patch)
treeaaafab671379794044c2a51c2abcb23c29e92569 /OpenSim/Region
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-b09fb01571f97643fd66a32a1fe75fc45863cc73.zip
opensim-SC_OLD-b09fb01571f97643fd66a32a1fe75fc45863cc73.tar.gz
opensim-SC_OLD-b09fb01571f97643fd66a32a1fe75fc45863cc73.tar.bz2
opensim-SC_OLD-b09fb01571f97643fd66a32a1fe75fc45863cc73.tar.xz
Fix a build break introduced by us having a more efficient DoubleDictionary
where core has a simple list
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index a88e86d..ff12d94 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -138,12 +138,16 @@ namespace OpenSim.Region.Framework.Scenes
138 138
139 public void Close() 139 public void Close()
140 { 140 {
141 List<Scene> localScenes = null;
142
141 lock (m_localScenes) 143 lock (m_localScenes)
142 { 144 {
143 for (int i = 0; i < m_localScenes.Count; i++) 145 localScenes = Scenes;
144 { 146 }
145 m_localScenes[i].Close(); 147
146 } 148 for (int i = 0; i < localScenes.Count; i++)
149 {
150 localScenes[i].Close();
147 } 151 }
148 } 152 }
149 153