aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorOren Hurvitz2012-08-27 12:47:04 +0300
committerJustin Clark-Casey (justincc)2012-09-14 20:32:25 +0100
commit5dd2569bf7d50217d1786c3268a537745b2e9fd3 (patch)
treefb5dfb30ef7a8eb9de8574d5a8c6b522f6659e06 /OpenSim/Region/Framework
parentRename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the ... (diff)
downloadopensim-SC_OLD-5dd2569bf7d50217d1786c3268a537745b2e9fd3.zip
opensim-SC_OLD-5dd2569bf7d50217d1786c3268a537745b2e9fd3.tar.gz
opensim-SC_OLD-5dd2569bf7d50217d1786c3268a537745b2e9fd3.tar.bz2
opensim-SC_OLD-5dd2569bf7d50217d1786c3268a537745b2e9fd3.tar.xz
Added unit tests for multi-region OARs
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c81b55d..cb5b2ba 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -92,7 +92,11 @@ namespace OpenSim.Region.Framework.Scenes
92 private static SceneManager m_instance = null; 92 private static SceneManager m_instance = null;
93 public static SceneManager Instance 93 public static SceneManager Instance
94 { 94 {
95 get { return m_instance; } 95 get {
96 if (m_instance == null)
97 m_instance = new SceneManager();
98 return m_instance;
99 }
96 } 100 }
97 101
98 private readonly List<Scene> m_localScenes = new List<Scene>(); 102 private readonly List<Scene> m_localScenes = new List<Scene>();