From e648854b9b145e09ddd5ff72d3fa9f65b2ff2813 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 11 Mar 2021 20:10:45 +0100 Subject: [PATCH] FIRE-30819: Fix animesh animations being broken if max. non-impostored avatars is set to 1 --- indra/newview/llvoavatar.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index bf3681804e..cf8916f91f 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5207,13 +5207,11 @@ bool LLVOAvatar::updateCharacter(LLAgent &agent) // for example, the "turn around" animation when entering customize avatar needs to trigger // even when your avatar is offscreen //-------------------------------------------------------------------- - // Fix impostered animation speed based on a fix by Henri Beauchamp - //if (!needs_update && !isSelf()) - //{ - // updateMotions(LLCharacter::HIDDEN_UPDATE); - // return FALSE; - //} - // + if (!needs_update && !isSelf()) + { + updateMotions(LLCharacter::HIDDEN_UPDATE); + return FALSE; + } //-------------------------------------------------------------------- // Handle transitions between regular rendering, jellydoll, or invisible. @@ -5227,17 +5225,6 @@ bool LLVOAvatar::updateCharacter(LLAgent &agent) // SL-763 the time step quantization does not currently work. //updateTimeStep(); - // Fix impostered animation speed based on a fix by Henri Beauchamp - // This was originally done in updateTimeStep(), but since that is globally disabled for now, we do it here - mMotionController.setUpdateFactor(mUpdatePeriod); - - if (!needs_update && !isSelf()) - { - updateMotions(LLCharacter::HIDDEN_UPDATE); - return FALSE; - } - // - //-------------------------------------------------------------------- // Update sitting state based on parent and active animation info. //--------------------------------------------------------------------