From 0bbccb1cda1af4084664f83426cdf3fe3153ca7f Mon Sep 17 00:00:00 2001 From: ziree Date: Fri, 18 Oct 2019 01:55:58 +0200 Subject: [PATCH] Make FS AO animation transitions smoother by avoiding double starts and stops of motions --- indra/newview/llvoavatar.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 60605c4ce2..78acc61b19 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6454,6 +6454,11 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset) else { gAgent.sendAnimationRequest(remap_id, ANIM_REQUEST_START); + + // since we did an override, there is no need to do anything else, + // specifically not the startMotion() part at the bottom of this function + // See FIRE-29020 + return true; } } else @@ -6495,6 +6500,11 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate) else { gAgent.sendAnimationRequest(remap_id, ANIM_REQUEST_STOP); + + // since we did an override, there is no need to do anything else, + // specifically not the stopMotion() part at the bottom of this function + // See FIRE-29020 + return true; } } else