aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-11-23 01:44:35 +0000
committerMelanie2012-11-23 01:44:35 +0000
commitc2e89334b829507fb77291ef86311fbbdd395afe (patch)
tree2a3eece2d126494132cd57fd2831521d283503bb /OpenSim/Region/Framework
parentMerge branch 'master' into careminster (diff)
parentFix recent windows build break. (diff)
downloadopensim-SC_OLD-c2e89334b829507fb77291ef86311fbbdd395afe.zip
opensim-SC_OLD-c2e89334b829507fb77291ef86311fbbdd395afe.tar.gz
opensim-SC_OLD-c2e89334b829507fb77291ef86311fbbdd395afe.tar.bz2
opensim-SC_OLD-c2e89334b829507fb77291ef86311fbbdd395afe.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 89e3ac5..a88e86d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -138,6 +138,13 @@ namespace OpenSim.Region.Framework.Scenes
138 138
139 public void Close() 139 public void Close()
140 { 140 {
141 lock (m_localScenes)
142 {
143 for (int i = 0; i < m_localScenes.Count; i++)
144 {
145 m_localScenes[i].Close();
146 }
147 }
141 } 148 }
142 149
143 public void Close(Scene cscene) 150 public void Close(Scene cscene)