aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-14 18:33:44 +0000
committerJustin Clark-Casey (justincc)2011-12-14 18:33:44 +0000
commite830a778607337a6aab27dd29e5657e3f8aa6b76 (patch)
tree04c36f64ba456230603dfd187c561c67e19d1818 /OpenSim/Region/Physics
parentEliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour ... (diff)
downloadopensim-SC-e830a778607337a6aab27dd29e5657e3f8aa6b76.zip
opensim-SC-e830a778607337a6aab27dd29e5657e3f8aa6b76.tar.gz
opensim-SC-e830a778607337a6aab27dd29e5657e3f8aa6b76.tar.bz2
opensim-SC-e830a778607337a6aab27dd29e5657e3f8aa6b76.tar.xz
Simplify some manipulation of _taintedActors in OdeScene
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs19
1 files changed, 6 insertions, 13 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 6ceb106..a6c2eca 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2612,12 +2612,9 @@ namespace OpenSim.Region.Physics.OdePlugin
2612 OdeCharacter taintedchar = ((OdeCharacter)actor); 2612 OdeCharacter taintedchar = ((OdeCharacter)actor);
2613 lock (_taintedActors) 2613 lock (_taintedActors)
2614 { 2614 {
2615 if (!(_taintedActors.Contains(taintedchar))) 2615 _taintedActors.Add(taintedchar);
2616 { 2616 if (taintedchar.bad)
2617 _taintedActors.Add(taintedchar); 2617 m_log.ErrorFormat("[ODE SCENE]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
2618 if (taintedchar.bad)
2619 m_log.DebugFormat("[ODE SCENE]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
2620 }
2621 } 2618 }
2622 } 2619 }
2623 } 2620 }
@@ -2714,14 +2711,10 @@ namespace OpenSim.Region.Physics.OdePlugin
2714 { 2711 {
2715 lock (_taintedActors) 2712 lock (_taintedActors)
2716 { 2713 {
2717 if (_taintedActors.Count > 0) 2714 foreach (OdeCharacter character in _taintedActors)
2718 { 2715 character.ProcessTaints();
2719 foreach (OdeCharacter character in _taintedActors)
2720 character.ProcessTaints();
2721 2716
2722 if (_taintedActors.Count > 0) 2717 _taintedActors.Clear();
2723 _taintedActors.Clear();
2724 }
2725 } 2718 }
2726 2719
2727 lock (_taintedPrims) 2720 lock (_taintedPrims)