1 files changed, 11 insertions, 0 deletions

diff --git a/linden/indra/llcharacter/llmotion.cpp b/linden/indra/llcharacter/llmotion.cpp
index b13ea60..40a30a4 100644
--- a/linden/indra/llcharacter/llmotion.cpp
+++ b/linden/indra/llcharacter/llmotion.cpp
@@ -126,6 +126,11 @@ void LLMotion::setDeactivateCallback( void (*cb)(void *), void* userdata )
         mDeactivateCallbackUserData = userdata;
 }
 
+BOOL LLMotion::isBlending()
+{
+        return mPose.getWeight() < 1.f;
+}
+
 //-----------------------------------------------------------------------------
 // activate()
 //-----------------------------------------------------------------------------
@@ -142,10 +147,16 @@ void LLMotion::activate()
 void LLMotion::deactivate()
 {
         mActive = FALSE;
+        mPose.setWeight(0.f);
 
         if (mDeactivateCallback) (*mDeactivateCallback)(mDeactivateCallbackUserData);
 
         onDeactivate();
 }
 
+BOOL LLMotion::canDeprecate()
+{
+        return TRUE;
+}
+
 // End