1 files changed, 6 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2026c53..e9571aa 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1896,7 +1896,12 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
 
-                    m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
+                    // If this part is a sculpt then delay the physics update until we've asynchronously loaded the
+                    // mesh data.
+                    if (((OpenMetaverse.SculptType)Shape.SculptType) == SculptType.Mesh)
+                        CheckSculptAndLoad();
+                    else
+                        m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
                 }
             }
         }