From 84d0699761b8da546f9faef084240d7b15f16321 Mon Sep 17 00:00:00 2001
From: Robert Adams <Robert.Adams@intel.com>
Date: Mon, 22 Jul 2013 12:07:42 -0700
Subject: [PATCH] Revert "BulletSim: Add logic to linksets to change physical
 properties for" The changes don't seem to be ready for prime time.

This reverts commit b44f0e1a00eba7f76401692322e48a3b23a81164.
---
 .../Region/Physics/BulletSPlugin/BSActors.cs  |  6 +++-
 .../Region/Physics/BulletSPlugin/BSLinkset.cs | 24 ++-----------
 .../BulletSPlugin/BSLinksetCompound.cs        | 36 -------------------
 3 files changed, 7 insertions(+), 59 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
index e0ccc501ca..fff63e4eb2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -69,7 +69,7 @@ public class BSActorCollection
     {
         lock (m_actors)
         {
-            ForEachActor(a => a.Dispose());
+            Release();
             m_actors.Clear();
         }
     }
@@ -98,6 +98,10 @@ public class BSActorCollection
     {
         ForEachActor(a => a.SetEnabled(enabl));
     }
+    public void Release()
+    {
+        ForEachActor(a => a.Dispose());
+    }
     public void Refresh()
     {
         ForEachActor(a => a.Refresh());
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 960c0b4d2b..78c0af7885 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -309,14 +309,14 @@ public abstract class BSLinkset
             }
         );
     }
-    public virtual void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
+    public virtual void ComputeLocalInertia()
     {
         ForEachMember((member) =>
             {
                 if (member.PhysBody.HasPhysicalBody)
                 {
                     OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass);
-                    member.Inertia = inertia * inertiaFactor;
+                    member.Inertia = inertia * BSParam.VehicleInertiaFactor;
                     m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia);
                     m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
                 }
@@ -324,26 +324,6 @@ public abstract class BSLinkset
             }
         );
     }
-    public virtual void SetPhysicalCollisionFlags(CollisionFlags collFlags)
-    {
-        ForEachMember((member) =>
-            {
-                if (member.PhysBody.HasPhysicalBody)
-                    m_physicsScene.PE.SetCollisionFlags(member.PhysBody, collFlags);
-                return false;   // 'false' says to continue looping
-            }
-        );
-    }
-    public virtual void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags)
-    {
-        ForEachMember((member) =>
-            {
-                if (member.PhysBody.HasPhysicalBody)
-                    m_physicsScene.PE.RemoveFromCollisionFlags(member.PhysBody, collFlags);
-                return false;   // 'false' says to continue looping
-            }
-        );
-    }
     // ================================================================
     protected virtual float ComputeLinksetMass()
     {
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 33ae5a503c..36684567c0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -44,42 +44,6 @@ public sealed class BSLinksetCompound : BSLinkset
     {
     }
 
-    // ================================================================
-    // Changing the physical property of the linkset only needs to change the root
-    public override void SetPhysicalFriction(float friction)
-    {
-        if (LinksetRoot.PhysBody.HasPhysicalBody)
-            m_physicsScene.PE.SetFriction(LinksetRoot.PhysBody, friction);
-    }
-    public override void SetPhysicalRestitution(float restitution)
-    {
-        if (LinksetRoot.PhysBody.HasPhysicalBody)
-            m_physicsScene.PE.SetRestitution(LinksetRoot.PhysBody, restitution);
-    }
-    public override void SetPhysicalGravity(OMV.Vector3 gravity)
-    {
-        if (LinksetRoot.PhysBody.HasPhysicalBody)
-            m_physicsScene.PE.SetGravity(LinksetRoot.PhysBody, gravity);
-    }
-    public override void ComputeLocalInertia(OMV.Vector3 inertiaFactor)
-    {
-        OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(LinksetRoot.PhysShape.physShapeInfo, LinksetRoot.Mass);
-        LinksetRoot.Inertia = inertia * inertiaFactor;
-        m_physicsScene.PE.SetMassProps(LinksetRoot.PhysBody, LinksetRoot.Mass, LinksetRoot.Inertia);
-        m_physicsScene.PE.UpdateInertiaTensor(LinksetRoot.PhysBody);
-    }
-    public override void SetPhysicalCollisionFlags(CollisionFlags collFlags)
-    {
-        if (LinksetRoot.PhysBody.HasPhysicalBody)
-            m_physicsScene.PE.SetCollisionFlags(LinksetRoot.PhysBody, collFlags);
-    }
-    public override void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags)
-    {
-        if (LinksetRoot.PhysBody.HasPhysicalBody)
-            m_physicsScene.PE.RemoveFromCollisionFlags(LinksetRoot.PhysBody, collFlags);
-    }
-    // ================================================================
-
     // When physical properties are changed the linkset needs to recalculate
     //   its internal properties.
     public override void Refresh(BSPrimLinkable requestor)