From 3f6698a595593edc4027ff58cbebf947a6b5ac1f Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 21 Jan 2013 09:19:09 -0800
Subject: BulletSim: remove unused MaxTaintsToProcessPerStep parameter

---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index e0b4992..12b1ef1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -81,7 +81,6 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     internal long m_simulationStep = 0;
     internal float NominalFrameRate { get; set; }
     public long SimulationStep { get { return m_simulationStep; } }
-    internal int m_taintsToProcessPerStep;
     internal float LastTimeStep { get; private set; }
 
     // Physical objects can register for prestep or poststep events
-- 
cgit v1.1


From 471c4778639aec60078e6cee7c964682c959f033 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 21 Jan 2013 15:58:22 -0800
Subject: BulletSim: allow changing position and rotation of a child of a
 linkset without rebuilding the whole compound shape. Should make vehicles
 move smoother.

---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 12b1ef1..8075b73 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -846,8 +846,6 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
     #endregion // Taints
 
-    #region INI and command line parameter processing
-
     #region IPhysicsParameters
     // Get the list of parameters this physics engine supports
     public PhysParameterEntry[] GetParameterList()
@@ -944,8 +942,6 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
     #endregion IPhysicsParameters
 
-    #endregion Runtime settable parameters
-
     // Invoke the detailed logger and output something if it's enabled.
     public void DetailLog(string msg, params Object[] args)
     {
-- 
cgit v1.1


From a5e9c665f08059fef16d0b0875697cb08e16351e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 23 Jan 2013 09:09:17 -0800
Subject: BulletSim: center-of-gravity linkset changes. Not working yet.

Conflicts:

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

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 8075b73..34fd2a0 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -708,8 +708,8 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     //    TriggerPreStepEvent
     //    DoOneTimeTaints
     //    Step()
-    //       ProcessAndForwardCollisions
-    //       ProcessAndForwardPropertyUpdates
+    //       ProcessAndSendToSimulatorCollisions
+    //       ProcessAndSendToSimulatorPropertyUpdates
     //    TriggerPostStepEvent
 
     // Calls to the PhysicsActors can't directly call into the physics engine
-- 
cgit v1.1