From 926ea0b39afd04cab469ca17b28f95ebf969e669 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 27 Jun 2008 21:02:01 +0000
Subject: QAR-669   1.20 Viewer RC11 QAR-648   1.20 Viewer RC10 merge
 Branch_1-20-Viewer-2 -r 88724:90511 -> release

---
 indra/llcharacter/llmotion.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'indra/llcharacter/llmotion.cpp')

diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp
index 9123ebfcbd..369e516482 100644
--- a/indra/llcharacter/llmotion.cpp
+++ b/indra/llcharacter/llmotion.cpp
@@ -127,6 +127,13 @@ void LLMotion::setDeactivateCallback( void (*cb)(void *), void* userdata )
 	mDeactivateCallbackUserData = userdata;
 }
 
+//virtual
+void LLMotion::setStopTime(F32 time)
+{
+	mStopTimestamp = time;
+	mStopped = TRUE;
+}
+
 BOOL LLMotion::isBlending()
 {
 	return mPose.getWeight() < 1.f;
@@ -135,8 +142,9 @@ BOOL LLMotion::isBlending()
 //-----------------------------------------------------------------------------
 // activate()
 //-----------------------------------------------------------------------------
-void LLMotion::activate()
+void LLMotion::activate(F32 time)
 {
+	mActivationTimestamp = time;
 	mStopped = FALSE;
 	mActive = TRUE;
 	onActivate();
@@ -150,7 +158,12 @@ void LLMotion::deactivate()
 	mActive = FALSE;
 	mPose.setWeight(0.f);
 
-	if (mDeactivateCallback) (*mDeactivateCallback)(mDeactivateCallbackUserData);
+	if (mDeactivateCallback)
+	{
+		(*mDeactivateCallback)(mDeactivateCallbackUserData);
+		mDeactivateCallback = NULL; // only call callback once
+		mDeactivateCallbackUserData = NULL;
+	}
 
 	onDeactivate();
 }
-- 
cgit v1.2.3