ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
John Hurliman
2009-10-23 10:37:01 -07:00
parent 4c45b5fd3c 8ba3afb59b
commit c749cf0061
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@@ -239,6 +239,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>();
private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
private readonly HashSet<OdePrim> _taintedPrimH = new HashSet<OdePrim>();
private readonly Object _taintedPrimLock = new Object();
private readonly List<OdePrim> _taintedPrimL = new List<OdePrim>();
private readonly HashSet<OdeCharacter> _taintedActors = new HashSet<OdeCharacter>();
private readonly List<d.ContactGeom> _perloopContact = new List<d.ContactGeom>();
@@ -2572,7 +2573,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (prim is OdePrim)
{
OdePrim taintedprim = ((OdePrim) prim);
lock (_taintedPrimH)
lock (_taintedPrimLock)
{
if (!(_taintedPrimH.Contains(taintedprim)))
{
@@ -2700,7 +2701,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// Modify other objects in the scene.
processedtaints = false;
lock (_taintedPrimL)
lock (_taintedPrimLock)
{
foreach (OdePrim prim in _taintedPrimL)
{