BulletSim: rearrange code and add different locking to eliminate chances

of race conditions and, especially, race conditions when an object is
removed and quickly re-added to a scene.

This hopefully reduces the occurance of problems when avatars TP within
a region -- the main problem being the loss of collisions.

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index d0cc1eb..9c3f160 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -459,7 +459,7 @@ public sealed class BSCharacter : BSPhysObject
             RawVelocity = value;
                 OMV.Vector3 vel = RawVelocity;
 
-            DetailLog("{0}: set Velocity = {1}", LogHeader, value);
+            DetailLog("{0}: set Velocity = {1}", LocalID, value);
 
             PhysScene.TaintedObject(LocalID, "BSCharacter.setVelocity", delegate()
             {
@@ -477,7 +477,7 @@ public sealed class BSCharacter : BSPhysObject
         set {
             PhysScene.AssertInTaintTime("BSCharacter.ForceVelocity");
 //                Util.PrintCallStack();
-            DetailLog("{0}: set ForceVelocity = {1}", LogHeader, value);
+            DetailLog("{0}: set ForceVelocity = {1}", LocalID, value);
 
             RawVelocity = value;
             PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);