aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-03-21 01:44:09 +0100
committerMelanie2013-03-21 01:44:09 +0100
commitcc504eb0d136d6555ddae990a98592eaf123816a (patch)
treedd27f28a7c9b59dba75bec9529dec3f4f5369d8d
parentMerge branch 'avination' into careminster (diff)
downloadopensim-SC-cc504eb0d136d6555ddae990a98592eaf123816a.zip
opensim-SC-cc504eb0d136d6555ddae990a98592eaf123816a.tar.gz
opensim-SC-cc504eb0d136d6555ddae990a98592eaf123816a.tar.bz2
opensim-SC-cc504eb0d136d6555ddae990a98592eaf123816a.tar.xz
Fix SceneManager to use the new automatic property throughout.
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c307f7a..c70342f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -100,7 +100,6 @@ namespace OpenSim.Region.Framework.Scenes
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>();
103 private Scene m_currentScene = null;
104 103
105 public List<Scene> Scenes 104 public List<Scene> Scenes
106 { 105 {
@@ -354,7 +353,7 @@ namespace OpenSim.Region.Framework.Scenes
354 353
355 if (m_localScenes.TryGetValue(regionName, out s)) 354 if (m_localScenes.TryGetValue(regionName, out s))
356 { 355 {
357 m_currentScene = s; 356 CurrentScene = s;
358 return true; 357 return true;
359 } 358 }
360 359
@@ -370,7 +369,7 @@ namespace OpenSim.Region.Framework.Scenes
370 369
371 if (m_localScenes.TryGetValue(regionID, out s)) 370 if (m_localScenes.TryGetValue(regionID, out s))
372 { 371 {
373 m_currentScene = s; 372 CurrentScene = s;
374 return true; 373 return true;
375 } 374 }
376 375