From 94dc7d07ebc22ce0e0d9b77e91538ddc90799bee Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Thu, 3 Nov 2011 17:06:08 -0700
Subject: Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls
 to the 3 iteration functions so more of them are using the correct iteration
 for the action they are performing. The 3 iterators that seem to fit all
 actions within OpenSim at this time are:

ForEachAvatar: Perform an action on all avatars (root presences)
ForEachClient: Perform an action on all clients (root or child clients)
ForEachRootClient: Perform an action on all clients that have an avatar

There are still a dozen places or so calling the old
ForEachScenePresence that will take a little more refactoring to
eliminate.
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 44f822c..1a709e9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -992,7 +992,7 @@ namespace OpenSim.Region.Framework.Scenes
         public PrimitiveBaseShape Shape
         {
             get { return m_shape; }
-            set { m_shape = value; }
+            set { m_shape = value;}
         }
 
         /// <summary>
@@ -1336,12 +1336,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="AgentID"></param>
         private void SendRootPartPropertiesToClient(UUID AgentID)
         {
-            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
+            m_parentGroup.Scene.ForEachClient(delegate(IClientAPI client)
             {
                 // Ugly reference :(
-                if (avatar.UUID == AgentID)
+                if (client.AgentId == AgentID)
                 {
-                    m_parentGroup.SendPropertiesToClient(avatar.ControllingClient);
+                    m_parentGroup.SendPropertiesToClient(client);
                 }
             });
         }
@@ -1461,9 +1461,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (volume < 0)
                 volume = 0;
 
-            m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+            m_parentGroup.Scene.ForEachRootClient(delegate(IClientAPI client)
             {
-                sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume);
+                client.SendAttachedSoundGainChange(UUID, (float)volume);
             });
         }
 
@@ -2216,7 +2216,7 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                         else
                         {
-                            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence av)
+                            m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence av)
                             {
                                 if (av.LocalId == localId)
                                 {
@@ -2347,7 +2347,7 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                         else
                         {
-                            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence av)
+                            m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence av)
                             {
                                 if (av.LocalId == localId)
                                 {
@@ -2470,7 +2470,7 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                         else
                         {
-                            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence av)
+                            m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence av)
                             {
                                 if (av.LocalId == localId)
                                 {
@@ -2696,7 +2696,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+            m_parentGroup.Scene.ForEachAvatar(delegate(ScenePresence sp)
             {
                 if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100))
                     sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
-- 
cgit v1.1