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

remove forgotten taints code

avinationmerge
UbitUmarov 2012-02-11 19:12:04 +00:00
parent 09f6647aa3
commit bcf59a574f
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
View File

@ -228,10 +228,6 @@ namespace OpenSim.Region.Physics.OdePlugin
private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>(); private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>();
private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>(); private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
private readonly Object _taintedCharacterLock = new Object();
private readonly HashSet<OdeCharacter> _taintedCharacterH = new HashSet<OdeCharacter>(); // faster verification of repeated character taints
private readonly Queue<OdeCharacter> _taintedCharacterQ = new Queue<OdeCharacter>(); // character taints
public OpenSim.Framework.LocklessQueue<ODEchangeitem> ChangesQueue = new OpenSim.Framework.LocklessQueue<ODEchangeitem>(); public OpenSim.Framework.LocklessQueue<ODEchangeitem> ChangesQueue = new OpenSim.Framework.LocklessQueue<ODEchangeitem>();
/// <summary> /// <summary>
@ -1579,34 +1575,6 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <param name="prim"></param> /// <param name="prim"></param>
public override void AddPhysicsActorTaint(PhysicsActor prim) public override void AddPhysicsActorTaint(PhysicsActor prim)
{ {
if (prim is OdePrim)
{
/* OdePrim taintedprim = ((OdePrim) prim);
lock (_taintedPrimLock)
{
if (!(_taintedPrimH.Contains(taintedprim)))
{
_taintedPrimH.Add(taintedprim); // HashSet for searching
_taintedPrimQ.Enqueue(taintedprim); // List for ordered readout
}
}
*/
return;
}
else if (prim is OdeCharacter)
{
OdeCharacter taintedchar = ((OdeCharacter)prim);
lock (_taintedCharacterLock)
{
if (!(_taintedCharacterH.Contains(taintedchar)))
{
_taintedCharacterH.Add(taintedchar);
_taintedCharacterQ.Enqueue(taintedchar);
if (taintedchar.bad)
m_log.DebugFormat("[PHYSICS]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
}
}
}
} }
/// <summary> /// <summary>