diff options
author | Dan Lake | 2011-11-01 17:20:12 -0700 |
---|---|---|
committer | Dan Lake | 2011-11-01 17:20:12 -0700 |
commit | 7c8bfac11ba35becd9a2f7fffaa568e1dade99ac (patch) | |
tree | e8f997d3ebddc0c10d4153375ea00d1a7f074b80 | |
parent | Part 2 of see_into_this_sim_from_neighbor configuration option removal (diff) | |
download | opensim-SC_OLD-7c8bfac11ba35becd9a2f7fffaa568e1dade99ac.zip opensim-SC_OLD-7c8bfac11ba35becd9a2f7fffaa568e1dade99ac.tar.gz opensim-SC_OLD-7c8bfac11ba35becd9a2f7fffaa568e1dade99ac.tar.bz2 opensim-SC_OLD-7c8bfac11ba35becd9a2f7fffaa568e1dade99ac.tar.xz |
Removed redundant SceneContents property from Scene. It's the same as SceneGraph property.
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index d1ce5df..b93a41b 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -135,7 +135,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
135 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; | 135 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; |
136 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; | 136 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; |
137 | CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS; | 137 | CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS; |
138 | GetClient = m_Scene.SceneContents.GetControllingClient; | 138 | GetClient = m_Scene.SceneGraph.GetControllingClient; |
139 | } | 139 | } |
140 | 140 | ||
141 | /// <summary> | 141 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 086de53..f012d72 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -470,11 +470,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
470 | get { return m_authenticateHandler; } | 470 | get { return m_authenticateHandler; } |
471 | } | 471 | } |
472 | 472 | ||
473 | public SceneGraph SceneContents | ||
474 | { | ||
475 | get { return m_sceneGraph; } | ||
476 | } | ||
477 | |||
478 | public bool UseBackup | 473 | public bool UseBackup |
479 | { | 474 | { |
480 | get { return m_useBackup; } | 475 | get { return m_useBackup; } |