aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/CollisionSounds.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
index 075724e..21c9ab9 100644
--- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -31,6 +31,7 @@ using System.Reflection;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Physics.Manager;
34using log4net; 35using log4net;
35 36
36namespace OpenSim.Region.Framework.Scenes 37namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 16a8588..735bd32 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4917,7 +4917,7 @@ namespace OpenSim.Region.Framework.Scenes
4917 4917
4918 pa.OnCollisionUpdate -= PhysicsCollision; 4918 pa.OnCollisionUpdate -= PhysicsCollision;
4919 4919
4920 bool hassound = (CollisionSoundType >= 0 && !VolumeDetectActive); 4920 bool hassound = (!VolumeDetectActive && CollisionSoundType >= 0 && ((Flags & PrimFlags.Physics) != 0));
4921 4921
4922 scriptEvents CombinedEvents = AggregateScriptEvents; 4922 scriptEvents CombinedEvents = AggregateScriptEvents;
4923 4923