From 0277259455c4354f81ea8a24c8ab93f27567bc6f Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Wed, 11 Apr 2007 17:54:18 +0000 Subject: svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release --- indra/llcharacter/llmotioncontroller.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llcharacter/llmotioncontroller.cpp') diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index b1fc20bf32..71bbdfb932 100644 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -790,6 +790,7 @@ BOOL LLMotionController::activateMotion(LLMotion *motion, F32 time) motion->mSendStopTimestamp = F32_MAX; } + mActiveMotions.remove(motion); // in case it is already in the active list mActiveMotions.push_front(motion); motion->activate(); -- cgit v1.2.3