Revert "BulletSim: move collision processing for linksets from BSPrimLinkable"

The changes don't seem to be ready for prime time.

This reverts commit b4c3a791aa55390bff071b3fe4bbe70c1d252703.

1 files changed, 0 insertions, 11 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index d34b797..fc4545f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -353,16 +353,6 @@ public abstract class BSPhysObject : PhysicsActor
                 CollidingStep = BSScene.NotASimulationStep;
             }
     }
-    // Complex objects (like linksets) need to know if there is a collision on any part of
-    //    their shape. 'IsColliding' has an existing definition of reporting a collision on
-    //    only this specific prim or component of linksets.
-    // 'HasSomeCollision' is defined as reporting if there is a collision on any part of
-    //    the complex body that this prim is the root of.
-    public virtual bool HasSomeCollision
-    {
-        get { return IsColliding; }
-        set { IsColliding = value; }
-    }
     public override bool CollidingGround {
         get { return (CollidingGroundStep == PhysScene.SimulationStep); }
         set
@@ -396,7 +386,6 @@ public abstract class BSPhysObject : PhysicsActor
     // Return 'true' if a collision was processed and should be sent up.
     // Return 'false' if this object is not enabled/subscribed/appropriate for or has already seen this collision.
     // Called at taint time from within the Step() function
-    public delegate bool CollideCall(uint collidingWith, BSPhysObject collidee, OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth);
     public virtual bool Collide(uint collidingWith, BSPhysObject collidee,
                     OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth)
     {