Merge branch 'master' into careminster

1 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index d584782..502f85f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -89,13 +89,6 @@ public sealed class BSCharacter : BSPhysObject
         // set _avatarVolume and _mass based on capsule size, _density and Scale
         ComputeAvatarVolumeAndMass();
 
-        // The avatar's movement is controlled by this motor that speeds up and slows down
-        //    the avatar seeking to reach the motor's target speed.
-        // This motor runs as a prestep action for the avatar so it will keep the avatar
-        //    standing as well as moving. Destruction of the avatar will destroy the pre-step action.
-        m_moveActor = new BSActorAvatarMove(PhysScene, this, AvatarMoveActorName);
-        PhysicalActors.Add(AvatarMoveActorName, m_moveActor);
-
         DetailLog("{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5},pos={6}",
                             LocalID, _size, Scale, Density, _avatarVolume, RawMass, pos);
 
@@ -106,6 +99,13 @@ public sealed class BSCharacter : BSPhysObject
             // New body and shape into PhysBody and PhysShape
             PhysScene.Shapes.GetBodyAndShape(true, PhysScene.World, this);
 
+            // The avatar's movement is controlled by this motor that speeds up and slows down
+            //    the avatar seeking to reach the motor's target speed.
+            // This motor runs as a prestep action for the avatar so it will keep the avatar
+            //    standing as well as moving. Destruction of the avatar will destroy the pre-step action.
+            m_moveActor = new BSActorAvatarMove(PhysScene, this, AvatarMoveActorName);
+            PhysicalActors.Add(AvatarMoveActorName, m_moveActor);
+
             SetPhysicalProperties();
         });
         return;