aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2012-05-17 01:36:42 +0100
committerUbitUmarov2012-05-17 01:36:42 +0100
commitb743835f9ed665c85eb78569b2bc31853eb64332 (patch)
tree0a75cccd009a8ee00281c1db84d708fd332822b5 /OpenSim/Region
parentdefault collision sounds. Incomplete, untested, needs revision (diff)
downloadopensim-SC-b743835f9ed665c85eb78569b2bc31853eb64332.zip
opensim-SC-b743835f9ed665c85eb78569b2bc31853eb64332.tar.gz
opensim-SC-b743835f9ed665c85eb78569b2bc31853eb64332.tar.bz2
opensim-SC-b743835f9ed665c85eb78569b2bc31853eb64332.tar.xz
default colisionVolume is 0, use it only for user specified sound
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index af9b7eb..5874d34 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2661,10 +2661,13 @@ namespace OpenSim.Region.Framework.Scenes
2661 2661
2662 bool IsNotVolumeDtc = !VolumeDetectActive; 2662 bool IsNotVolumeDtc = !VolumeDetectActive;
2663 2663
2664 if (IsNotVolumeDtc && startedColliders.Count > 0 && CollisionSoundVolume > 0.0f && CollisionSound != invalidCollisionSoundUUID) 2664 if (IsNotVolumeDtc && startedColliders.Count > 0 && CollisionSound != invalidCollisionSoundUUID)
2665 { 2665 {
2666 if(CollisionSound != UUID.Zero) 2666 if (CollisionSound != UUID.Zero)
2667 SendCollisionSound(CollisionSound, CollisionSoundVolume); 2667 {
2668 if (CollisionSoundVolume > 0.0f)
2669 SendCollisionSound(CollisionSound, CollisionSoundVolume);
2670 }
2668 else 2671 else
2669 { 2672 {
2670 CollisionSounds.PartCollisionSound(this, startedColliders); 2673 CollisionSounds.PartCollisionSound(this, startedColliders);