diff options
| author | John Hurliman | 2009-10-23 10:37:01 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-23 10:37:01 -0700 |
| commit | c749cf006115a63dfe715a1a4fe45308cc17d2c7 (patch) | |
| tree | 5a6476d9f04f120b3a3644c050952a48bab6afdb /OpenSim | |
| parent | Cleaning up OpenSim.ini.example for LLUDP. The [LLClient] section has been re... (diff) | |
| parent | Patch from dslake http://opensimulator.org/mantis/view.php?id=4291 0004291: I... (diff) | |
| download | opensim-SC_OLD-c749cf006115a63dfe715a1a4fe45308cc17d2c7.zip opensim-SC_OLD-c749cf006115a63dfe715a1a4fe45308cc17d2c7.tar.gz opensim-SC_OLD-c749cf006115a63dfe715a1a4fe45308cc17d2c7.tar.bz2 opensim-SC_OLD-c749cf006115a63dfe715a1a4fe45308cc17d2c7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 0a065be..f979ce3 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -239,6 +239,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 239 | private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>(); | 239 | private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>(); |
| 240 | private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>(); | 240 | private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>(); |
| 241 | private readonly HashSet<OdePrim> _taintedPrimH = new HashSet<OdePrim>(); | 241 | private readonly HashSet<OdePrim> _taintedPrimH = new HashSet<OdePrim>(); |
| 242 | private readonly Object _taintedPrimLock = new Object(); | ||
| 242 | private readonly List<OdePrim> _taintedPrimL = new List<OdePrim>(); | 243 | private readonly List<OdePrim> _taintedPrimL = new List<OdePrim>(); |
| 243 | private readonly HashSet<OdeCharacter> _taintedActors = new HashSet<OdeCharacter>(); | 244 | private readonly HashSet<OdeCharacter> _taintedActors = new HashSet<OdeCharacter>(); |
| 244 | private readonly List<d.ContactGeom> _perloopContact = new List<d.ContactGeom>(); | 245 | private readonly List<d.ContactGeom> _perloopContact = new List<d.ContactGeom>(); |
| @@ -2572,7 +2573,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2572 | if (prim is OdePrim) | 2573 | if (prim is OdePrim) |
| 2573 | { | 2574 | { |
| 2574 | OdePrim taintedprim = ((OdePrim) prim); | 2575 | OdePrim taintedprim = ((OdePrim) prim); |
| 2575 | lock (_taintedPrimH) | 2576 | lock (_taintedPrimLock) |
| 2576 | { | 2577 | { |
| 2577 | if (!(_taintedPrimH.Contains(taintedprim))) | 2578 | if (!(_taintedPrimH.Contains(taintedprim))) |
| 2578 | { | 2579 | { |
| @@ -2700,7 +2701,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2700 | // Modify other objects in the scene. | 2701 | // Modify other objects in the scene. |
| 2701 | processedtaints = false; | 2702 | processedtaints = false; |
| 2702 | 2703 | ||
| 2703 | lock (_taintedPrimL) | 2704 | lock (_taintedPrimLock) |
| 2704 | { | 2705 | { |
| 2705 | foreach (OdePrim prim in _taintedPrimL) | 2706 | foreach (OdePrim prim in _taintedPrimL) |
| 2706 | { | 2707 | { |