1 files changed, 9 insertions, 4 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 9c3f160..cfcccac 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -75,9 +75,10 @@ public sealed class BSCharacter : BSPhysObject
     // Avatars are always complete (in the physics engine sense)
     public override bool IsIncomplete { get { return false; } }
 
+    // 'activate' is called with this character after all initialization is complete
     public BSCharacter(
-            uint localID, String avName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 vel, OMV.Vector3 size, bool isFlying)
-
+            uint localID, String avName, BSScene parent_scene,
+            OMV.Vector3 pos, OMV.Vector3 vel, OMV.Vector3 size, bool isFlying, Action<BSCharacter> activate)
             : base(parent_scene, localID, avName, "BSCharacter")
     {
         _physicsActorType = (int)ActorTypes.Agent;
@@ -124,6 +125,9 @@ public sealed class BSCharacter : BSPhysObject
             SetPhysicalProperties();
 
             IsInitialized = true;
+
+            if (activate != null)
+                activate(this);
         });
         return;
     }
@@ -472,12 +476,13 @@ public sealed class BSCharacter : BSPhysObject
         }
     }
 
+    // Force the setting of velocity. Called at taint time.
+    // Exists so that setting force by anyone can be overridden by a subcless.
     public override OMV.Vector3 ForceVelocity {
         get { return RawVelocity; }
         set {
             PhysScene.AssertInTaintTime("BSCharacter.ForceVelocity");
-//                Util.PrintCallStack();
-            DetailLog("{0}: set ForceVelocity = {1}", LocalID, value);
+            DetailLog("{0},BSCharacter.setForceVelocity,call,vel={1}", LocalID, value);
 
             RawVelocity = value;
             PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);