aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs')
-rwxr-xr-xOpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs4
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
index cda33e4..86bf23f 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
@@ -75,8 +75,6 @@ public sealed class BSShapeCollection : IDisposable
75 // Called at taint-time. 75 // Called at taint-time.
76 public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim, PhysicalDestructionCallback bodyCallback) 76 public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim, PhysicalDestructionCallback bodyCallback)
77 { 77 {
78 m_physicsScene.AssertNotInSimulationTime("BSShapeCollection.GetBodyAndShape");
79
80 bool ret = false; 78 bool ret = false;
81 79
82 // This lock could probably be pushed down lower but building shouldn't take long 80 // This lock could probably be pushed down lower but building shouldn't take long
@@ -346,8 +344,6 @@ public sealed class BSShapeCollection : IDisposable
346 if (!body.HasPhysicalBody) 344 if (!body.HasPhysicalBody)
347 return; 345 return;
348 346
349 m_physicsScene.AssertNotInSimulationTime("BSShapeCollection.DereferenceBody");
350
351 lock (m_collectionActivityLock) 347 lock (m_collectionActivityLock)
352 { 348 {
353 if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,DestroyingBody,body={1}", body.ID, body); 349 if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,DestroyingBody,body={1}", body.ID, body);