diff options
author | Robert Adams | 2013-08-27 09:55:50 -0700 |
---|---|---|
committer | Robert Adams | 2013-08-27 09:55:50 -0700 |
commit | 0882cf0fc32dac05d0e762abf68d6956305543bc (patch) | |
tree | 0b10c5b2ca1fc2b47016f3db286a6330ac8b47a3 /OpenSim/Region/Physics | |
parent | Revert "Make HG logins fall back to fallback regions if the desired region fa... (diff) | |
download | opensim-SC-0882cf0fc32dac05d0e762abf68d6956305543bc.zip opensim-SC-0882cf0fc32dac05d0e762abf68d6956305543bc.tar.gz opensim-SC-0882cf0fc32dac05d0e762abf68d6956305543bc.tar.bz2 opensim-SC-0882cf0fc32dac05d0e762abf68d6956305543bc.tar.xz |
BulletSim: add some protections for processing when shutting down.
Attempt to fix Mantis 6740 (http://opensimulator.org/mantis/view.php?id=6740).
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 88d50b4..c92c9b9 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 | |||
946 | 946 | ||
947 | private void ProcessRegularTaints() | 947 | private void ProcessRegularTaints() |
948 | { | 948 | { |
949 | if (_taintOperations.Count > 0) // save allocating new list if there is nothing to process | 949 | if (m_initialized && _taintOperations.Count > 0) // save allocating new list if there is nothing to process |
950 | { | 950 | { |
951 | // swizzle a new list into the list location so we can process what's there | 951 | // swizzle a new list into the list location so we can process what's there |
952 | List<TaintCallbackEntry> oldList; | 952 | List<TaintCallbackEntry> oldList; |
@@ -989,7 +989,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
989 | // Taints that happen after the normal taint processing but before the simulation step. | 989 | // Taints that happen after the normal taint processing but before the simulation step. |
990 | private void ProcessPostTaintTaints() | 990 | private void ProcessPostTaintTaints() |
991 | { | 991 | { |
992 | if (_postTaintOperations.Count > 0) | 992 | if (m_initialized && _postTaintOperations.Count > 0) |
993 | { | 993 | { |
994 | Dictionary<string, TaintCallbackEntry> oldList; | 994 | Dictionary<string, TaintCallbackEntry> oldList; |
995 | lock (_taintLock) | 995 | lock (_taintLock) |