From 7c8bfac11ba35becd9a2f7fffaa568e1dade99ac Mon Sep 17 00:00:00 2001
From: Dan Lake <dan.lake@intel.com>
Date: Tue, 1 Nov 2011 17:20:12 -0700
Subject: [PATCH] Removed redundant SceneContents property from Scene. It's the
 same as SceneGraph property.

---
 .../ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs       | 2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs                     | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index d1ce5df3c5..b93a41b662 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
             ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset;
             TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset;
             CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS;
-            GetClient = m_Scene.SceneContents.GetControllingClient;
+            GetClient = m_Scene.SceneGraph.GetControllingClient;
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 086de53103..f012d72741 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -470,11 +470,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_authenticateHandler; }
         }
 
-        public SceneGraph SceneContents
-        {
-            get { return m_sceneGraph; }
-        }
-
         public bool UseBackup
         {
             get { return m_useBackup; }