* Pass 2 of collidable (non physical) linksets

* Linkset status is now persistent
* Tweaked a physics child prim positioning hack to generate less database saves
* Re-factored physics object creation calls into ApplyPhysics.  To create a new physics representation of an object or linkset, it's only necessary to call *group*.ApplyPhysics(bool m_physicalPrim).  *lbsa has been waiting for this refactoring*
* We have collidable linksets now. (they don't become phantom anymore)

1 files changed, 16 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index ffc72c9..b591802 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             AttachToBackup();
 
-            ApplyPhysics();
+            ApplyPhysics(scene.m_physicalPrim);
 
             ScheduleGroupForFullUpdate();
         }
@@ -302,7 +302,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             AttachToBackup();
 
-            ApplyPhysics();
+            ApplyPhysics(scene.m_physicalPrim);
 
             ScheduleGroupForFullUpdate();
         }
@@ -426,7 +426,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             AttachToBackup();
 
-            ApplyPhysics();
+            //ApplyPhysics(scene.m_physicalPrim);
         }
 
         /// <summary>
@@ -1577,6 +1577,12 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        public void ResetChildPrimPhysicsPositions()
+        {
+            AbsolutePosition = AbsolutePosition;
+            HasChanged = false;
+        }
+
         public LLUUID GetPartsFullID(uint localID)
         {
             SceneObjectPart part = GetChildPart(localID);
@@ -1649,18 +1655,22 @@ namespace OpenSim.Region.Environment.Scenes
             Text = text;
         }
 
-        public void ApplyPhysics()
+        public void ApplyPhysics(bool m_physicalPrim)
         {
             if (m_parts.Count > 1)
             {
                 foreach (SceneObjectPart parts in m_parts.Values)
                 {
-                    parts.ApplyPhysics();
+                    parts.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
+                    
+                    // Hack to get the physics scene geometries in the right spot
+                    ResetChildPrimPhysicsPositions();
+                   
                 }
             }
             else
             {
-                m_rootPart.ApplyPhysics();
+                m_rootPart.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
             }
         }
     }