From 33d6222e8dc40331e98c3549a040d3d206eed338 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Wed, 31 Oct 2007 04:18:34 +0000
Subject: Thank you Teravus, very much, for a 'jump', 'crouch' and 'inertia'
 patch for all three physics plugins.

---
 OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/BulletXPlugin')

diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index 1658e2d..8b05295 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -643,6 +643,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
         private PhysicsVector _acceleration;
         private AxiomQuaternion _orientation;
         private bool flying;
+        private bool iscolliding = false;
         private RigidBody rigidBody;
 
         public Vector3 RigidBodyPosition
@@ -773,6 +774,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin
             get { return flying; }
             set { flying = value; }
         }
+        public override bool IsColliding
+        {
+            get { return iscolliding; }
+            set { iscolliding = value; }
+        }
 
         public void SetAcceleration(PhysicsVector accel)
         {
@@ -913,6 +919,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
         private BulletXScene _parent_scene;
         //_physical value will be linked with the prim object value
         private Boolean _physical = false;
+        private Boolean iscolliding = false;
 
         public Vector3 RigidBodyPosition
         {
@@ -1060,6 +1067,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin
             set { }
         }
 
+        public override bool IsColliding
+        {
+            get { return iscolliding; }
+            set { iscolliding = value; }
+        }
         public Boolean Physical
         {
             get { return _physical; }
@@ -1304,4 +1316,4 @@ namespace OpenSim.Region.Physics.BulletXPlugin
             return height;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1