OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-05-17 02:37:57 +02:00
parent 845f8423e4 b743835f9e
commit 1a32d27879
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -2661,10 +2661,13 @@ namespace OpenSim.Region.Framework.Scenes
bool IsNotVolumeDtc = !VolumeDetectActive; bool IsNotVolumeDtc = !VolumeDetectActive;
if (IsNotVolumeDtc && startedColliders.Count > 0 && CollisionSoundVolume > 0.0f && CollisionSound != invalidCollisionSoundUUID) if (IsNotVolumeDtc && startedColliders.Count > 0 && CollisionSound != invalidCollisionSoundUUID)
{ {
if(CollisionSound != UUID.Zero) if (CollisionSound != UUID.Zero)
SendCollisionSound(CollisionSound, CollisionSoundVolume); {
if (CollisionSoundVolume > 0.0f)
SendCollisionSound(CollisionSound, CollisionSoundVolume);
}
else else
{ {
CollisionSounds.PartCollisionSound(this, startedColliders); CollisionSounds.PartCollisionSound(this, startedColliders);