* Refactor: Remove SceneObjectGroup.GetScenePresences() in favour of a direct call to Scene

4 files changed, 13 insertions, 20 deletions

diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 11bafb7..18a2851 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -35,13 +35,15 @@ namespace OpenSim.Region.Environment.Scenes
 {
     [Serializable]
     public abstract class EntityBase : ISerializable
-    {
-        protected Scene m_scene;
-        
+    {   
+        /// <summary>
+        /// The scene to which this entity belongs
+        /// </summary>
         public Scene Scene
         {
             get { return m_scene; }
         }
+        protected Scene m_scene;
 
         protected LLUUID m_uuid;
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d017c50..4188deb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3096,7 +3096,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        /// Request a List of all ScenePresences in this region
+        /// Request a List of all ScenePresences in this region.  This returns child agents as well as root agents.
         /// </summary>
         /// <returns></returns>
         public List<ScenePresence> GetScenePresences()
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index bc99aa4..4a112ae 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -785,15 +785,6 @@ namespace OpenSim.Region.Environment.Scenes
             part.ClearUndoState();
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public List<ScenePresence> GetScenePresences()
-        {
-            return m_scene.GetScenePresences();
-        }
-
         public override void UpdateMovement()
         {
             lock (m_parts)
@@ -933,7 +924,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 foreach (SceneObjectPart part in m_parts.Values)
                 {
-                    List<ScenePresence> avatars = GetScenePresences();
+                    List<ScenePresence> avatars = Scene.GetScenePresences();
                     for (int i = 0; i < avatars.Count; i++)
                     {
                         if (avatars[i].ParentID == LocalId)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 6c5a68d..c171e78 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -2247,7 +2247,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         private void SendObjectPropertiesToClient(LLUUID AgentID)
         {
-            List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
+            List<ScenePresence> avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Count; i++)
             {
                 // Ugly reference :(
@@ -2277,7 +2277,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void AddFullUpdateToAllAvatars()
         {
-            List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
+            List<ScenePresence> avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Count; i++)
             {
                 avatars[i].QueuePartForUpdate(this);
@@ -2286,7 +2286,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void SendFullUpdateToAllClientsExcept(LLUUID agentID)
         {
-            List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
+            List<ScenePresence> avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Count; i++)
             {
                 // Ugly reference :(
@@ -2309,7 +2309,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void SendFullUpdateToAllClients()
         {
-            List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
+            List<ScenePresence> avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Count; i++)
             {
                 // Ugly reference :(
@@ -2370,7 +2370,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// Terse updates
         public void AddTerseUpdateToAllAvatars()
         {
-            List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
+            List<ScenePresence> avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Count; i++)
             {
                 avatars[i].QueuePartForUpdate(this);
@@ -2387,7 +2387,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void SendTerseUpdateToAllClients()
         {
-            List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
+            List<ScenePresence> avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Count; i++)
             {
                 m_parentGroup.SendPartTerseUpdate(avatars[i].ControllingClient, this);