Mantis #2058

Remove the physics representation of link set child prims when the
link set is deleted.

1 files changed, 11 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 9b91176..424c56c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1756,11 +1756,19 @@ namespace OpenSim.Region.Environment.Scenes
         {
             SceneObjectPart rootPart = group.GetChildPart(group.UUID);
 
-            if (rootPart.PhysActor != null)
+            foreach (SceneObjectPart part in group.Children.Values)
             {
-                PhysicsScene.RemovePrim(rootPart.PhysActor);
-                rootPart.PhysActor = null;
+                if (part.PhysActor != null)
+                {
+                    PhysicsScene.RemovePrim(part.PhysActor);
+                    part.PhysActor = null;
+                }
             }
+//            if (rootPart.PhysActor != null)
+//            {
+//                PhysicsScene.RemovePrim(rootPart.PhysActor);
+//                rootPart.PhysActor = null;
+//            }
 
             if (UnlinkSceneObject(group.UUID, false))
             {