From 969a4bf934030fe543cd9b05e3ef1e2da0ba11d1 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 27 Apr 2010 23:01:11 -0400 Subject: work in progress on improved default animations --- indra/llcharacter/llmotioncontroller.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra') diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index 5070f83ed6..6df72a4d9b 100644 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -449,9 +449,15 @@ BOOL LLMotionController::stopMotionInstance(LLMotion* motion, BOOL stop_immediat return FALSE; } + // If on active list, stop it if (isMotionActive(motion) && !motion->isStopped()) { + if (motion->getID() == ANIM_AGENT_FEMALE_WALK_NEW || motion->getID() == ANIM_AGENT_FEMALE_WALK) + { + llinfos << "stop female walk: " << animationName(motion->getID()) << llendl; + } + motion->setStopTime(mAnimTime); if (stop_immediate) { -- cgit v1.2.3