diff options
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
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.AssertInTaintTime("BSShapeCollection.GetBodyAndShape"); | 78 | m_physicsScene.AssertNotInSimulationTime("BSShapeCollection.GetBodyAndShape"); |
79 | 79 | ||
80 | bool ret = false; | 80 | bool ret = false; |
81 | 81 | ||
@@ -344,7 +344,7 @@ public sealed class BSShapeCollection : IDisposable | |||
344 | if (!body.HasPhysicalBody) | 344 | if (!body.HasPhysicalBody) |
345 | return; | 345 | return; |
346 | 346 | ||
347 | m_physicsScene.AssertInTaintTime("BSShapeCollection.DereferenceBody"); | 347 | m_physicsScene.AssertNotInSimulationTime("BSShapeCollection.DereferenceBody"); |
348 | 348 | ||
349 | lock (m_collectionActivityLock) | 349 | lock (m_collectionActivityLock) |
350 | { | 350 | { |