From 93adc4cb6689b156db4db315d44b5ba0ddcd65ac Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 9 Jan 2013 22:45:01 -0800
Subject: BulletSim: Add IsSelected attribute to physical objects. Have
 vehicles check to see if physical before trying to step. Replace vehicle
 gravity application. Previously relying on Bullet to apply gravity but since
 vehicles over-ride the velocity calculation, gravity never had a chance to
 accelerate the body down. Added AddForceImpulse as well as AddForce for those
 who need to apply immediate velocity updates. Use the impulse to apply the
 linear motion.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 939d38a..aadb583 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -328,6 +328,10 @@ public sealed class BSCharacter : BSPhysObject
     public override bool Selected {
         set { _selected = value; }
     }
+    public override bool IsSelected
+    {
+        get { return _selected; }
+    }
     public override void CrossingFailure() { return; }
     public override void link(PhysicsActor obj) { return; }
     public override void delink() { return; }
-- 
cgit v1.1


From 4e1ca890c2d41bf244ed7d4847c0d0a4fc7f6c51 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 14 Jan 2013 15:46:46 -0800
Subject: BulletSim: fix not moving physical objects below terrain to over
 terrain. Add locking on register prestep action list preventing potential
 race conditions. Little comment and formatting changes.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index aadb583..a5fec87 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -126,9 +126,9 @@ public sealed class BSCharacter : BSPhysObject
         DetailLog("{0},BSCharacter.Destroy", LocalID);
         PhysicsScene.TaintedObject("BSCharacter.destroy", delegate()
         {
-            PhysicsScene.Shapes.DereferenceBody(PhysBody, true, null);
+            PhysicsScene.Shapes.DereferenceBody(PhysBody, true /* inTaintTime */, null /* bodyCallback */);
             PhysBody.Clear();
-            PhysicsScene.Shapes.DereferenceShape(PhysShape, true, null);
+            PhysicsScene.Shapes.DereferenceShape(PhysShape, true /* inTaintTime */, null /* bodyCallback */);
             PhysShape.Clear();
         });
     }
-- 
cgit v1.1