aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/CollisionSounds.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
index a22ee10..c46756c 100644
--- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes
167 SceneObjectPart otherPart = part.ParentGroup.Scene.GetSceneObjectPart(Id); 167 SceneObjectPart otherPart = part.ParentGroup.Scene.GetSceneObjectPart(Id);
168 if (otherPart != null) 168 if (otherPart != null)
169 { 169 {
170 if (otherPart.CollisionSound == part.invalidCollisionSoundUUID) 170 if (otherPart.CollisionSound == part.invalidCollisionSoundUUID || otherPart.VolumeDetectActive)
171 continue; 171 continue;
172 if (otherPart.CollisionSound != UUID.Zero) 172 if (otherPart.CollisionSound != UUID.Zero)
173 otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume); 173 otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume);