From b743835f9ed665c85eb78569b2bc31853eb64332 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 17 May 2012 01:36:42 +0100 Subject: [PATCH] default colisionVolume is 0, use it only for user specified sound --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index af9b7eb817..5874d34159 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -2661,10 +2661,13 @@ namespace OpenSim.Region.Framework.Scenes bool IsNotVolumeDtc = !VolumeDetectActive; - if (IsNotVolumeDtc && startedColliders.Count > 0 && CollisionSoundVolume > 0.0f && CollisionSound != invalidCollisionSoundUUID) + if (IsNotVolumeDtc && startedColliders.Count > 0 && CollisionSound != invalidCollisionSoundUUID) { - if(CollisionSound != UUID.Zero) - SendCollisionSound(CollisionSound, CollisionSoundVolume); + if (CollisionSound != UUID.Zero) + { + if (CollisionSoundVolume > 0.0f) + SendCollisionSound(CollisionSound, CollisionSoundVolume); + } else { CollisionSounds.PartCollisionSound(this, startedColliders);