1 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/llcharacter/llmotioncontroller.cpp b/linden/indra/llcharacter/llmotioncontroller.cpp
index e2453c9..3ef35ec 100644
--- a/linden/indra/llcharacter/llmotioncontroller.cpp
+++ b/linden/indra/llcharacter/llmotioncontroller.cpp
@@ -546,6 +546,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                         {
                                 if (motionp->isStopped() && mTime > motionp->getStopTime() + motionp->getEaseOutDuration())
                                 {
+                                        posep->setWeight(0.f);
                                         deactivateMotion(motionp);
                                 }
                                 continue;
@@ -572,6 +573,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                         }
                         else
                         {
+                                posep->setWeight(0.f);
                                 deactivateMotion(motionp);
                                 continue;
                         }
@@ -822,7 +824,6 @@ BOOL LLMotionController::activateMotion(LLMotion *motion, F32 time)
 //-----------------------------------------------------------------------------
 BOOL LLMotionController::deactivateMotion(LLMotion *motion)
 {
-        motion->getPose()->setWeight(0.f);
         motion->deactivate();
         mActiveMotions.remove(motion);