Merge branch 'ubitwork'

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

3 files changed, 32 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index dd3b8aa..ba5f4d5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2633,6 +2633,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     m_log.Error("Unable to send part Physics Proprieties - exception: " + ex.ToString());
                 }
+                part.UpdatePhysRequired = false;
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 18069af..ccc3f32 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1521,7 +1521,11 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         SceneObjectPart part = GetSceneObjectPart(localID);
                         if (part != null)
+                        {
                             part.UpdateExtraPhysics(PhysData);
+                            if (part.UpdatePhysRequired)
+                                remoteClient.SendPartPhysicsProprieties(part);
+                        }
                     }
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 84b4bb3..85d2bee 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1030,6 +1030,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public UpdateRequired UpdateFlag { get; set; }
+        public bool UpdatePhysRequired { get; set; }
         
         /// <summary>
         /// Used for media on a prim.
@@ -1410,6 +1411,7 @@ namespace OpenSim.Region.Framework.Scenes
                         if(ParentGroup != null)
                             ParentGroup.HasGroupChanged = true;
                         ScheduleFullUpdateIfNone();
+                        UpdatePhysRequired = true;
                     }
                 }
             }
@@ -1501,12 +1503,15 @@ namespace OpenSim.Region.Framework.Scenes
                         m_physicsShapeType = DefaultPhysicsShapeType();
                     else
                         m_physicsShapeType = value;
-                    ScheduleFullUpdateIfNone();
                 }
                 else
                     m_physicsShapeType = DefaultPhysicsShapeType();
+
                 if (ParentGroup != null)
                     ParentGroup.HasGroupChanged = true;
+
+                if(m_physicsShapeType != value)
+                    UpdatePhysRequired = true;
             }
         }
 
@@ -1518,8 +1523,11 @@ namespace OpenSim.Region.Framework.Scenes
                 if (value >=1 && value <= 22587.0)
                 {
                     m_density = value;
-                    ScheduleFullUpdateIfNone();
+                    UpdatePhysRequired = true;
                 }
+
+                ScheduleFullUpdateIfNone();
+
                 if (ParentGroup != null)
                     ParentGroup.HasGroupChanged = true;
             }
@@ -1529,11 +1537,18 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get { return m_gravitymod; }
             set
-            {   if( value >= -1 && value <=28.0f)
-                m_gravitymod = value;
+            {
+                if( value >= -1 && value <=28.0f)
+                {
+                    m_gravitymod = value;
+                    UpdatePhysRequired = true;
+                }
+
                 ScheduleFullUpdateIfNone();
+
                 if (ParentGroup != null)
                     ParentGroup.HasGroupChanged = true;
+
             }
         }
 
@@ -1545,8 +1560,11 @@ namespace OpenSim.Region.Framework.Scenes
                 if (value >= 0 && value <= 255.0f)
                 {
                     m_friction = value;
-                    ScheduleFullUpdateIfNone();
+                    UpdatePhysRequired = true;
                 }
+
+                ScheduleFullUpdateIfNone();
+
                 if (ParentGroup != null)
                     ParentGroup.HasGroupChanged = true;
             }
@@ -1560,8 +1578,11 @@ namespace OpenSim.Region.Framework.Scenes
                 if (value >= 0 && value <= 1.0f)
                 {
                     m_bounce = value;
-                    ScheduleFullUpdateIfNone();
+                    UpdatePhysRequired = true;
                 }
+
+                ScheduleFullUpdateIfNone();
+
                 if (ParentGroup != null)
                     ParentGroup.HasGroupChanged = true;
             }