From 7a5f598399c7373bd146061b478e6d04cb204879 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 27 Dec 2012 16:05:11 -0800
Subject: BulletSim: move logic for IsColliding, CollidingGround and
 CollidingObj from individual sub-classes and up to parent BSPhysObject class.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index f804a0f..06e4ada 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -915,18 +915,6 @@ public sealed class BSPrim : BSPhysObject
         get { return _throttleUpdates; }
         set { _throttleUpdates = value; }
     }
-    public override bool IsColliding {
-        get { return (CollidingStep == PhysicsScene.SimulationStep); }
-        set { _isColliding = value; }
-    }
-    public override bool CollidingGround {
-        get { return (CollidingGroundStep == PhysicsScene.SimulationStep); }
-        set { _collidingGround = value; }
-    }
-    public override bool CollidingObj {
-        get { return _collidingObj; }
-        set { _collidingObj = value; }
-    }
     public bool IsPhantom {
         get {
             // SceneObjectPart removes phantom objects from the physics scene
@@ -1006,12 +994,12 @@ public sealed class BSPrim : BSPhysObject
     public override OMV.Vector3 PIDTarget {
         set { _PIDTarget = value; }
     }
-    public override bool PIDActive {
-        set { _usePID = value; }
-    }
     public override float PIDTau {
         set { _PIDTau = value; }
     }
+    public override bool PIDActive {
+        set { _usePID = value; }
+    }
 
     // Used for llSetHoverHeight and maybe vehicle height
     // Hover Height will override MoveTo target's Z
-- 
cgit v1.1