diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 6e20d14..0a8edf9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1493,10 +1493,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1493 | if (volume < 0) | 1493 | if (volume < 0) |
1494 | volume = 0; | 1494 | volume = 0; |
1495 | 1495 | ||
1496 | m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp) | 1496 | m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp) |
1497 | { | 1497 | { |
1498 | if (!sp.IsChildAgent) | 1498 | sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume); |
1499 | sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume); | ||
1500 | }); | 1499 | }); |
1501 | } | 1500 | } |
1502 | 1501 | ||
@@ -2136,6 +2135,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2136 | 2135 | ||
2137 | public void PhysicsCollision(EventArgs e) | 2136 | public void PhysicsCollision(EventArgs e) |
2138 | { | 2137 | { |
2138 | // m_log.DebugFormat("Invoking PhysicsCollision on {0} {1} {2}", Name, LocalId, UUID); | ||
2139 | |||
2139 | // single threaded here | 2140 | // single threaded here |
2140 | 2141 | ||
2141 | CollisionEventUpdate a = (CollisionEventUpdate)e; | 2142 | CollisionEventUpdate a = (CollisionEventUpdate)e; |
@@ -2729,10 +2730,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2729 | TaskInventory.LockItemsForRead(false); | 2730 | TaskInventory.LockItemsForRead(false); |
2730 | } | 2731 | } |
2731 | 2732 | ||
2732 | m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp) | 2733 | m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp) |
2733 | { | 2734 | { |
2734 | if (sp.IsChildAgent) | ||
2735 | return; | ||
2736 | if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100)) | 2735 | if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100)) |
2737 | sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID); | 2736 | sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID); |
2738 | }); | 2737 | }); |