From e4231e95a976f8b3c02add39b94721eebb639674 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 17 May 2012 04:41:46 +0100
Subject: increase avatars collisions report to 10 per sec, Stopped sound on
 avatar to volumedetect collision

---
 OpenSim/Region/Framework/Scenes/CollisionSounds.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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
                 SceneObjectPart otherPart = part.ParentGroup.Scene.GetSceneObjectPart(Id);
                 if (otherPart != null)
                 {
-                    if (otherPart.CollisionSound == part.invalidCollisionSoundUUID)
+                    if (otherPart.CollisionSound == part.invalidCollisionSoundUUID || otherPart.VolumeDetectActive)
                         continue;
                     if (otherPart.CollisionSound != UUID.Zero)
                         otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume);
-- 
cgit v1.1