From 0882cf0fc32dac05d0e762abf68d6956305543bc Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Tue, 27 Aug 2013 09:55:50 -0700 Subject: [PATCH] BulletSim: add some protections for processing when shutting down. Attempt to fix Mantis 6740 (http://opensimulator.org/mantis/view.php?id=6740). --- OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 88d50b438b..c92c9b90c5 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs @@ -946,7 +946,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters 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 List oldList; @@ -989,7 +989,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters // Taints that happen after the normal taint processing but before the simulation step. private void ProcessPostTaintTaints() { - if (_postTaintOperations.Count > 0) + if (m_initialized && _postTaintOperations.Count > 0) { Dictionary oldList; lock (_taintLock)