diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneManager.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index c5c083a..1e418df 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -91,12 +91,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
91 | 91 | ||
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 { | 95 | get { |
96 | if (m_instance == null) | 96 | if (m_instance == null) |
97 | m_instance = new SceneManager(); | 97 | m_instance = new SceneManager(); |
98 | return m_instance; | 98 | return m_instance; |
99 | } | 99 | } |
100 | } | 100 | } |
101 | 101 | ||
102 | private readonly DoubleDictionary<UUID, string, Scene> m_localScenes = new DoubleDictionary<UUID, string, Scene>(); | 102 | private readonly DoubleDictionary<UUID, string, Scene> m_localScenes = new DoubleDictionary<UUID, string, Scene>(); |
@@ -340,7 +340,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
340 | 340 | ||
341 | public bool TrySetCurrentScene(string regionName) | 341 | public bool TrySetCurrentScene(string regionName) |
342 | { | 342 | { |
343 | if ((String.Compare(regionName, "root") == 0) | 343 | if ((String.Compare(regionName, "root") == 0) |
344 | || (String.Compare(regionName, "..") == 0) | 344 | || (String.Compare(regionName, "..") == 0) |
345 | || (String.Compare(regionName, "/") == 0)) | 345 | || (String.Compare(regionName, "/") == 0)) |
346 | { | 346 | { |
@@ -398,7 +398,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
398 | return true; | 398 | return true; |
399 | } | 399 | } |
400 | } | 400 | } |
401 | 401 | ||
402 | scene = null; | 402 | scene = null; |
403 | return false; | 403 | return false; |
404 | } | 404 | } |
@@ -415,7 +415,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
415 | return true; | 415 | return true; |
416 | } | 416 | } |
417 | } | 417 | } |
418 | 418 | ||
419 | scene = null; | 419 | scene = null; |
420 | return false; | 420 | return false; |
421 | } | 421 | } |