ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

BulletSim: modify taint processing which use locks.

Browse Source 
(Merge branch 'bullettaint' into bulletcast)
This commit is contained in:
Robert Adams
2017-09-02 13:08:54 -07:00
parent 0afa3a294a 5c36561424
commit 33e773959f
5 changed files with 62 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
View File

@@ -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;
@@ -346,7 +346,7 @@ public sealed class BSShapeCollection : IDisposable
if (!body.HasPhysicalBody)
return;
m_physicsScene.AssertInTaintTime("BSShapeCollection.DereferenceBody");
m_physicsScene.AssertNotInSimulationTime("BSShapeCollection.DereferenceBody");
lock (m_collectionActivityLock)
{