1 files changed, 28 insertions, 17 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 85d2bee..51a3c18 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1497,6 +1497,7 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_physicsShapeType; }
             set
             {
+                byte oldv = m_physicsShapeType;
                 if (value >= 0 && value <= (byte)PhysShapeType.convex)
                 {
                     if (value == (byte)PhysShapeType.none && ParentGroup != null && ParentGroup.RootPart == this)
@@ -1507,11 +1508,33 @@ namespace OpenSim.Region.Framework.Scenes
                 else
                     m_physicsShapeType = DefaultPhysicsShapeType();
 
-                if (ParentGroup != null)
-                    ParentGroup.HasGroupChanged = true;
 
-                if(m_physicsShapeType != value)
+                if (m_physicsShapeType != oldv && ParentGroup != null)
+                {
+                    if (m_physicsShapeType == (byte)PhysShapeType.none)
+                    {
+                        if (PhysActor != null)
+                        {
+                            Velocity = new Vector3(0, 0, 0);
+                            Acceleration = new Vector3(0, 0, 0);
+                            if (ParentGroup.RootPart == this)
+                                AngularVelocity = new Vector3(0, 0, 0);
+                            ParentGroup.Scene.RemovePhysicalPrim(1);
+                            RemoveFromPhysics();
+                        }
+                    }
+                    else if (PhysActor == null)
+                        ApplyPhysics((uint)Flags, VolumeDetectActive, false);
+                    else
+                        PhysActor.PhysicsShapeType = m_physicsShapeType;                   
+                }
+                if (m_physicsShapeType != value)
+                {
+                    if (ParentGroup != null)
+                        ParentGroup.HasGroupChanged = true;
+
                     UpdatePhysRequired = true;
+                }
             }
         }
 
@@ -1832,6 +1855,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 GetWorldRotation(),
                                 isPhysical,
                                 isPhantom,
+                                PhysicsShapeType,
                                 m_localId);
                     }
                     catch
@@ -4574,20 +4598,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 PhysicsShapeType = (byte)physdata.PhysShapeType;
 
-                if (PhysicsShapeType == (byte)PhysShapeType.none)
-                {
-                    if (PhysActor != null)
-                    {
-                        Velocity = new Vector3(0, 0, 0);
-                        Acceleration = new Vector3(0, 0, 0);
-                        if (ParentGroup.RootPart == this)
-                            AngularVelocity = new Vector3(0, 0, 0);
-                        ParentGroup.Scene.RemovePhysicalPrim(1);
-                        RemoveFromPhysics();
-                    }
-                }
-                else if (PhysActor == null)
-                    ApplyPhysics((uint)Flags, VolumeDetectActive, false);
             }
 
             if(Density != physdata.Density)
@@ -4732,6 +4742,7 @@ namespace OpenSim.Region.Framework.Scenes
                             GetWorldRotation(), //physics wants world rotation like all other functions send
                             UsePhysics,
                             SetPhantom,
+                            PhysicsShapeType,
                             m_localId);
 
                         PhysActor.SetMaterial(Material);