1 files changed, 13 insertions, 8 deletions

diff --git a/linden/indra/llcharacter/llmotioncontroller.cpp b/linden/indra/llcharacter/llmotioncontroller.cpp
index 3ef35ec..2427fd8 100644
--- a/linden/indra/llcharacter/llmotioncontroller.cpp
+++ b/linden/indra/llcharacter/llmotioncontroller.cpp
@@ -360,7 +360,7 @@ BOOL LLMotionController::startMotion(const LLUUID &id, F32 start_offset)
         {       
                 if (motion->isStopped()) // motion has been stopped
                 {
-                        deactivateMotion(motion);
+                        deactivateMotion(motion, false);
                 }
                 else if (mTime < motion->mSendStopTimestamp)    // motion is still active
                 {
@@ -396,7 +396,7 @@ BOOL LLMotionController::stopMotionLocally(const LLUUID &id, BOOL stop_immediate
 
                 if (stop_immediate)
                 {
-                        deactivateMotion(motion);
+                        deactivateMotion(motion, false);
                 }
                 return TRUE;
         }
@@ -492,7 +492,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                 {
                         if (motionp->isStopped() && mTime > motionp->getStopTime() + motionp->getEaseOutDuration())
                         {
-                                deactivateMotion(motionp);
+                                deactivateMotion(motionp, false);
                         }
                         else if (motionp->isStopped() && mTime > motionp->getStopTime())
                         {
@@ -546,8 +546,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                         {
                                 if (motionp->isStopped() && mTime > motionp->getStopTime() + motionp->getEaseOutDuration())
                                 {
-                                        posep->setWeight(0.f);
-                                        deactivateMotion(motionp);
+                                        deactivateMotion(motionp, true);
                                 }
                                 continue;
                         }
@@ -573,8 +572,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                         }
                         else
                         {
-                                posep->setWeight(0.f);
-                                deactivateMotion(motionp);
+                                deactivateMotion(motionp, true);
                                 continue;
                         }
                 }
@@ -822,8 +820,15 @@ BOOL LLMotionController::activateMotion(LLMotion *motion, F32 time)
 //-----------------------------------------------------------------------------
 // deactivateMotion()
 //-----------------------------------------------------------------------------
-BOOL LLMotionController::deactivateMotion(LLMotion *motion)
+BOOL LLMotionController::deactivateMotion(LLMotion *motion, bool remove_weight)
 {
+        if( remove_weight )
+        {
+                // immediately remove pose weighting instead of letting it time out
+                LLPose *posep = motion->getPose();
+                posep->setWeight(0.f);
+        }
+        
         motion->deactivate();
         mActiveMotions.remove(motion);