diff options
author | Melanie | 2010-01-03 21:43:39 +0000 |
---|---|---|
committer | Melanie | 2010-01-03 21:43:39 +0000 |
commit | 61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11 (patch) | |
tree | 7780b88dc26de91fe0b95a0a234a7f995adf5d22 /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |
parent | Add virtual method StateChange to ScriptBaseClass (diff) | |
parent | Cause llSetText to send prim updates. (diff) | |
download | opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.zip opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.gz opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.bz2 opensim-SC-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 0384d6e..7984bd9 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -2152,7 +2152,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2152 | /// <param name="prim"></param> | 2152 | /// <param name="prim"></param> |
2153 | public void RemovePrimThreadLocked(OdePrim prim) | 2153 | public void RemovePrimThreadLocked(OdePrim prim) |
2154 | { | 2154 | { |
2155 | //Console.WriteLine("RemovePrimThreadLocked " + prim.m_primName); | 2155 | //Console.WriteLine("RemovePrimThreadLocked " + prim.m_primName); |
2156 | lock (prim) | 2156 | lock (prim) |
2157 | { | 2157 | { |
2158 | remCollisionEventReporting(prim); | 2158 | remCollisionEventReporting(prim); |
@@ -2603,12 +2603,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2603 | lock (_taintedPrimLock) | 2603 | lock (_taintedPrimLock) |
2604 | { | 2604 | { |
2605 | if (!(_taintedPrimH.Contains(taintedprim))) | 2605 | if (!(_taintedPrimH.Contains(taintedprim))) |
2606 | { | 2606 | { |
2607 | //Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.m_primName); | 2607 | //Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.m_primName); |
2608 | _taintedPrimH.Add(taintedprim); // HashSet for searching | 2608 | _taintedPrimH.Add(taintedprim); // HashSet for searching |
2609 | _taintedPrimL.Add(taintedprim); // List for ordered readout | 2609 | _taintedPrimL.Add(taintedprim); // List for ordered readout |
2610 | } | 2610 | } |
2611 | } | 2611 | } |
2612 | return; | 2612 | return; |
2613 | } | 2613 | } |
2614 | else if (prim is OdeCharacter) | 2614 | else if (prim is OdeCharacter) |
@@ -2736,12 +2736,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2736 | { | 2736 | { |
2737 | if (prim.m_taintremove) | 2737 | if (prim.m_taintremove) |
2738 | { | 2738 | { |
2739 | //Console.WriteLine("Simulate calls RemovePrimThreadLocked"); | 2739 | //Console.WriteLine("Simulate calls RemovePrimThreadLocked"); |
2740 | RemovePrimThreadLocked(prim); | 2740 | RemovePrimThreadLocked(prim); |
2741 | } | 2741 | } |
2742 | else | 2742 | else |
2743 | { | 2743 | { |
2744 | //Console.WriteLine("Simulate calls ProcessTaints"); | 2744 | //Console.WriteLine("Simulate calls ProcessTaints"); |
2745 | prim.ProcessTaints(timeStep); | 2745 | prim.ProcessTaints(timeStep); |
2746 | } | 2746 | } |
2747 | processedtaints = true; | 2747 | processedtaints = true; |
@@ -2937,7 +2937,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2937 | } | 2937 | } |
2938 | 2938 | ||
2939 | if (processedtaints) | 2939 | if (processedtaints) |
2940 | //Console.WriteLine("Simulate calls Clear of _taintedPrim list"); | 2940 | //Console.WriteLine("Simulate calls Clear of _taintedPrim list"); |
2941 | _taintedPrimH.Clear(); | 2941 | _taintedPrimH.Clear(); |
2942 | _taintedPrimL.Clear(); | 2942 | _taintedPrimL.Clear(); |
2943 | } | 2943 | } |