1 files changed, 10 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0e21487..88bdf31 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1321,11 +1321,11 @@ namespace OpenSim.Region.Framework.Scenes
             if (volume < 0)
                 volume = 0;
 
-            List<ScenePresence> avatarts = m_parentGroup.Scene.GetAvatars();
-            foreach (ScenePresence p in avatarts)
+            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                p.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume);
-            }
+                if(!sp.IsChildAgent)
+                    sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume);
+            });
         }
 
         /// <summary>
@@ -2609,12 +2609,13 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            List<ScenePresence> avatarts = m_parentGroup.Scene.GetAvatars();
-            foreach (ScenePresence p in avatarts)
+            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                if (!(Util.GetDistanceTo(p.AbsolutePosition, AbsolutePosition) >= 100))
-                    p.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
-            }
+                if (sp.IsChildAgent)
+                    return;
+                if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100))
+                    sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
+            });
         }
 
         public void RemFlag(PrimFlags flag)