From da7340b9fb6a6f4468310958671f429f133e8424 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Jul 2011 01:42:56 +0100
Subject: If resized shape is a mesh/sculpt, leave it to the mesh asset
 callback to trigger the physics actor taint.

In the last commit, the fix was made by updating all the child prim physics actors with the new size rather than just the root part.
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index fd5f1b0..9c307a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2789,7 +2789,10 @@ namespace OpenSim.Region.Framework.Scenes
                         if (obPart.PhysActor != null)
                         {
                             obPart.PhysActor.Size = newSize;
-                            m_scene.PhysicsScene.AddPhysicsActorTaint(obPart.PhysActor);
+
+                            // If we're a sculpt wait for the trigger when the sculpt texture is retrieved.
+                            if (((OpenMetaverse.SculptType)obPart.Shape.SculptType) != SculptType.Mesh)
+                                m_scene.PhysicsScene.AddPhysicsActorTaint(obPart.PhysActor);
                         }
                     }
 
@@ -2800,7 +2803,10 @@ namespace OpenSim.Region.Framework.Scenes
                 if (part.PhysActor != null)
                 {
                     part.PhysActor.Size = prevScale;
-                    m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor);
+
+                    // If we're a sculpt wait for the trigger when the sculpt texture is retrieved.
+                    if (((OpenMetaverse.SculptType)part.Shape.SculptType) != SculptType.Mesh)
+                        m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor);
                 }
 
                 part.IgnoreUndoUpdate = false;
-- 
cgit v1.1