2 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
index a02f108..de82ddc 100644
--- a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -188,6 +188,7 @@ namespace OpenSim.Region.Framework.Scenes
         
         public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist)
         {
+            // disable for now
             return;
 
             if (collidersinfolist.Count == 0 || part == null)
@@ -298,8 +299,9 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public static void AvatarCollisionSound(ScenePresence av, List<CollisionForSoundInfo> collidersinfolist)
-        {
-            return;
+         {
+             // disable for now
+             return;
 
             if (collidersinfolist.Count == 0 || av == null)
                 return;
@@ -372,4 +374,4 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index 1bfe08b..5109a6a 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -1482,8 +1482,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                 if (!haveMesh)

                     m_NoColide = true;

             }

-            else if(_pbs.SculptEntry)

-                m_NoColide = true; // also don't colide if is a sculp or mesh and meshing is off

 

             if (!haveMesh)

             {