diff options
author | Dan Lake | 2011-10-27 01:25:12 -0700 |
---|---|---|
committer | Dan Lake | 2011-10-27 01:25:12 -0700 |
commit | 06577d7299f38c342c9b241c691e647e5329837e (patch) | |
tree | e288b6229d18163507bf9ee6c8aaa23a7568b962 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Added new ForEachRootScenePresence to Scene since almost every delegate passe... (diff) | |
download | opensim-SC-06577d7299f38c342c9b241c691e647e5329837e.zip opensim-SC-06577d7299f38c342c9b241c691e647e5329837e.tar.gz opensim-SC-06577d7299f38c342c9b241c691e647e5329837e.tar.bz2 opensim-SC-06577d7299f38c342c9b241c691e647e5329837e.tar.xz |
Continuation of previous checkin. Found more places where ForEachScenePresence can be changed to ForEachRootScenePresence.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c8ecc9b..3a4f52e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1440,10 +1440,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1440 | if (volume < 0) | 1440 | if (volume < 0) |
1441 | volume = 0; | 1441 | volume = 0; |
1442 | 1442 | ||
1443 | m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp) | 1443 | m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp) |
1444 | { | 1444 | { |
1445 | if (!sp.IsChildAgent) | 1445 | sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume); |
1446 | sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume); | ||
1447 | }); | 1446 | }); |
1448 | } | 1447 | } |
1449 | 1448 | ||
@@ -2676,10 +2675,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2676 | } | 2675 | } |
2677 | } | 2676 | } |
2678 | 2677 | ||
2679 | m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp) | 2678 | m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp) |
2680 | { | 2679 | { |
2681 | if (sp.IsChildAgent) | ||
2682 | return; | ||
2683 | if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100)) | 2680 | if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100)) |
2684 | sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID); | 2681 | sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID); |
2685 | }); | 2682 | }); |