summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llmotion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcharacter/llmotion.cpp')
-rw-r--r--indra/llcharacter/llmotion.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp
index a53956223c..73aefa6640 100644
--- a/indra/llcharacter/llmotion.cpp
+++ b/indra/llcharacter/llmotion.cpp
@@ -106,6 +106,11 @@ void LLMotion::setDeactivateCallback( void (*cb)(void *), void* userdata )
mDeactivateCallbackUserData = userdata;
}
+BOOL LLMotion::isBlending()
+{
+ return mPose.getWeight() < 1.f;
+}
+
//-----------------------------------------------------------------------------
// activate()
//-----------------------------------------------------------------------------
@@ -122,10 +127,16 @@ void LLMotion::activate()
void LLMotion::deactivate()
{
mActive = FALSE;
+ mPose.setWeight(0.f);
if (mDeactivateCallback) (*mDeactivateCallback)(mDeactivateCallbackUserData);
onDeactivate();
}
+BOOL LLMotion::canDeprecate()
+{
+ return TRUE;
+}
+
// End