diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-28 19:13:17 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-28 19:13:17 +0100 |
| commit | 2c81ace766546da0ea11efd4fa27cf1717eb5411 (patch) | |
| tree | 004a76e7394e3fe04694ca52ae61de0f9da140ec /indra | |
| parent | a84ee929a5221aec07bcc93815ca6c57bb8ab6bb (diff) | |
SL-1290 - stop animations immediately if avatar is paused
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcharacter/llmotioncontroller.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index 3116403616..c48d02b652 100644 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -441,7 +441,8 @@ BOOL LLMotionController::stopMotionLocally(const LLUUID &id, BOOL stop_immediate { // if already inactive, return false LLMotion *motion = findMotion(id); - return stopMotionInstance(motion, stop_immediate); + // SL-1290: always stop immediate if paused + return stopMotionInstance(motion, stop_immediate||mPaused); } BOOL LLMotionController::stopMotionInstance(LLMotion* motion, BOOL stop_immediate) diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 913460b3d1..192307dc8b 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4726,7 +4726,6 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons } else { -#if 1 bool is_paused = avatar && avatar->areAnimationsPaused(); if (is_paused) { @@ -4736,7 +4735,6 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons return; } } -#endif } |