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

Simplify some manipulation of _taintedActors in OdeScene

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-12-14 18:33:44 +00:00
parent cfdccdd71c
commit 903da8acbd
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -2613,13 +2613,10 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
OdeCharacter taintedchar = ((OdeCharacter)actor); OdeCharacter taintedchar = ((OdeCharacter)actor);
lock (_taintedActors) lock (_taintedActors)
{
if (!(_taintedActors.Contains(taintedchar)))
{ {
_taintedActors.Add(taintedchar); _taintedActors.Add(taintedchar);
if (taintedchar.bad) if (taintedchar.bad)
m_log.DebugFormat("[ODE SCENE]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid); m_log.ErrorFormat("[ODE SCENE]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
}
} }
} }
} }
@ -2699,16 +2696,12 @@ namespace OpenSim.Region.Physics.OdePlugin
try try
{ {
lock (_taintedActors) lock (_taintedActors)
{
if (_taintedActors.Count > 0)
{ {
foreach (OdeCharacter character in _taintedActors) foreach (OdeCharacter character in _taintedActors)
character.ProcessTaints(); character.ProcessTaints();
if (_taintedActors.Count > 0)
_taintedActors.Clear(); _taintedActors.Clear();
} }
}
lock (_taintedPrims) lock (_taintedPrims)
{ {