Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge

2 files changed, 18 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 935cac5..03b5d36 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2094,8 +2094,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else if (part.PhysActor != null)
                 {
-                    PhysicsScene.RemovePrim(part.PhysActor);
-                    part.PhysActor = null;
+                    part.RemoveFromPhysics();
                 }
             }
             
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 370c55b..1cdd567 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1641,6 +1641,7 @@ namespace OpenSim.Region.Framework.Scenes
                         m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom.", m_uuid);
                         PhysActor = null;
                     }
+
                     // Basic Physics returns null..  joy joy joy.
                     if (PhysActor != null)
                     {
@@ -4454,12 +4455,9 @@ namespace OpenSim.Region.Framework.Scenes
                 || (Shape.PathCurve == (byte)Extrusion.Flexible)) // note: this may have been changed above in the case of joints
             {
                 AddFlag(PrimFlags.Phantom);
+
                 if (PhysActor != null)
-                {
-                    m_parentGroup.Scene.PhysicsScene.RemovePrim(PhysActor);
-                    /// that's not wholesome.  Had to make Scene public
-                    PhysActor = null;
-                }
+                    RemoveFromPhysics();
             }
             else // Not phantom
             {
@@ -4573,6 +4571,20 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat("[SCENE OBJECT PART]: Updated PrimFlags on {0} {1} to {2}", Name, LocalId, Flags);
         }
 
+        /// <summary>
+        /// This removes the part from physics
+        /// </summary>
+        /// <remarks>
+        /// This isn't the same as turning off physical, since even without being physical the prim has a physics
+        /// representation for collision detection.  Rather, this would be used in situations such as making a prim
+        /// phantom.
+        /// </remarks>
+        public void RemoveFromPhysics()
+        {
+            ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor);
+            PhysActor = null;
+        }
+
         public void UpdateRotation(Quaternion rot)
         {
             if ((rot.X != RotationOffset.X) ||