From 5c36561424c8b093e24c683c2ff6e83410739388 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 28 Aug 2017 15:23:32 -0700
Subject: BulletSim: add clock and change logic for taint processing a little
 so taints check if they are not in simulation time and execute immediately if
 not.

---
 OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs')

diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
index 4ec6f51..8d8fc95 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
@@ -75,7 +75,7 @@ public sealed class BSShapeCollection : IDisposable
     // Called at taint-time.
     public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim, PhysicalDestructionCallback bodyCallback)
     {
-        m_physicsScene.AssertInTaintTime("BSShapeCollection.GetBodyAndShape");
+        m_physicsScene.AssertNotInSimulationTime("BSShapeCollection.GetBodyAndShape");
 
         bool ret = false;
 
@@ -344,7 +344,7 @@ public sealed class BSShapeCollection : IDisposable
         if (!body.HasPhysicalBody)
             return;
 
-        m_physicsScene.AssertInTaintTime("BSShapeCollection.DereferenceBody");
+        m_physicsScene.AssertNotInSimulationTime("BSShapeCollection.DereferenceBody");
 
         lock (m_collectionActivityLock)
         {
-- 
cgit v1.1