Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge

2 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7493368..2507c67 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1568,7 +1568,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void ApplyPhysics(bool m_physicalPrim)
         {
             // Apply physics to the root prim
-            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_physicalPrim);
+            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive);
             
             // Apply physics to child prims
             SceneObjectPart[] parts = m_parts.GetArray();
@@ -1578,7 +1578,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     SceneObjectPart part = parts[i];
                     if (part.LocalId != m_rootPart.LocalId)
-                        part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim);
+                        part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive);
                 }
 
                 // Hack to get the physics scene geometries in the right spot
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5abf9dd..92db8b0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1600,15 +1600,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// Apply physics to this part.
         /// </summary>
         /// <param name="rootObjectFlags"></param>
-        /// <param name="m_physicalPrim"></param>
-        public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim)
+        /// <param name="VolumeDetectActive"></param>
+        public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive)
         {
 //            m_log.DebugFormat(
 //                "[SCENE OBJECT PART]: Applying physics to {0} {1}, m_physicalPrim {2}",
 //                Name, LocalId, UUID, m_physicalPrim);
 
-            bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim);
-            bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0);
+            bool isPhysical = (rootObjectFlags & (uint) PrimFlags.Physics) != 0;
+            bool isPhantom = (rootObjectFlags & (uint) PrimFlags.Phantom) != 0;
 
             if (IsJoint())
             {