diff options
| author | UbitUmarov | 2012-05-15 16:56:43 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-05-15 16:56:43 +0100 |
| commit | accab1e086b8a77b233371b07b648195355d6603 (patch) | |
| tree | 085e061e824c2be5030327bc2574562e4695349c /OpenSim/Region/Framework/Scenes | |
| parent | sop: - added UpdatePhysicsSubscribedEvents() to update physics ator collision... (diff) | |
| download | opensim-SC_OLD-accab1e086b8a77b233371b07b648195355d6603.zip opensim-SC_OLD-accab1e086b8a77b233371b07b648195355d6603.tar.gz opensim-SC_OLD-accab1e086b8a77b233371b07b648195355d6603.tar.bz2 opensim-SC_OLD-accab1e086b8a77b233371b07b648195355d6603.tar.xz | |
sop colisions don't play sounds on volume detectors
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 11d6b57..3850e46 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2652,7 +2652,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2652 | m_lastColliders.Remove(localID); | 2652 | m_lastColliders.Remove(localID); |
| 2653 | } | 2653 | } |
| 2654 | // play the sound. | 2654 | // play the sound. |
| 2655 | if (startedColliders.Count > 0 && CollisionSound != UUID.Zero && CollisionSoundVolume > 0.0f) | 2655 | if (startedColliders.Count > 0 && CollisionSound != UUID.Zero && CollisionSoundVolume > 0.0f && !ParentGroup.RootPart.VolumeDetectActive) |
| 2656 | SendSound(CollisionSound.ToString(), CollisionSoundVolume, true, (byte)0, 0, false, false); | 2656 | SendSound(CollisionSound.ToString(), CollisionSoundVolume, true, (byte)0, 0, false, false); |
| 2657 | 2657 | ||
| 2658 | SendCollisionEvent(scriptEvents.collision_start, startedColliders, ParentGroup.Scene.EventManager.TriggerScriptCollidingStart); | 2658 | SendCollisionEvent(scriptEvents.collision_start, startedColliders, ParentGroup.Scene.EventManager.TriggerScriptCollidingStart); |