OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BulletSim: add some protections for processing when shutting down. 

Attempt to fix Mantis 6740 (http://opensimulator.org/mantis/view.php?id=6740).
varregion
Robert Adams 2013-08-27 09:55:50 -07:00
parent 0dd9a68eb7
commit 0882cf0fc3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
View File

@ -946,7 +946,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
private void ProcessRegularTaints() private void ProcessRegularTaints()
{ {
if (_taintOperations.Count > 0) // save allocating new list if there is nothing to process if (m_initialized && _taintOperations.Count > 0) // save allocating new list if there is nothing to process
{ {
// swizzle a new list into the list location so we can process what's there // swizzle a new list into the list location so we can process what's there
List<TaintCallbackEntry> oldList; List<TaintCallbackEntry> oldList;
@ -989,7 +989,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
// Taints that happen after the normal taint processing but before the simulation step. // Taints that happen after the normal taint processing but before the simulation step.
private void ProcessPostTaintTaints() private void ProcessPostTaintTaints()
{ {
if (_postTaintOperations.Count > 0) if (m_initialized && _postTaintOperations.Count > 0)
{ {
Dictionary<string, TaintCallbackEntry> oldList; Dictionary<string, TaintCallbackEntry> oldList;
lock (_taintLock) lock (_taintLock)