From 81d7844f5196aeee7a02c924448795820dbf5e8b Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 15 May 2012 17:01:00 +0100
Subject:  use part VolumeDetectActive and not rootPart.VolumeDetectActive to
 be coerent with other places in case of future changes. Should be equivalent
 if all is well.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3850e46..8716e20 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2652,11 +2652,14 @@ namespace OpenSim.Region.Framework.Scenes
                     m_lastColliders.Remove(localID);
             }
             // play the sound.
-            if (startedColliders.Count > 0 && CollisionSound != UUID.Zero && CollisionSoundVolume > 0.0f && !ParentGroup.RootPart.VolumeDetectActive)
+
+            bool IsNotVolumeDtc = !VolumeDetectActive;
+
+            if (startedColliders.Count > 0 && CollisionSound != UUID.Zero && CollisionSoundVolume > 0.0f && IsNotVolumeDtc)
                 SendSound(CollisionSound.ToString(), CollisionSoundVolume, true, (byte)0, 0, false, false);
 
             SendCollisionEvent(scriptEvents.collision_start, startedColliders, ParentGroup.Scene.EventManager.TriggerScriptCollidingStart);
-            if(!ParentGroup.RootPart.VolumeDetectActive)
+            if (IsNotVolumeDtc)
                 SendCollisionEvent(scriptEvents.collision      , m_lastColliders , ParentGroup.Scene.EventManager.TriggerScriptColliding);
             SendCollisionEvent(scriptEvents.collision_end  , endedColliders  , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd);
 
-- 
cgit v1.1