From cdb316834ac6fc724719cb2f7136f3eaae455923 Mon Sep 17 00:00:00 2001 From: Router Gray Date: Mon, 2 Dec 2019 18:01:00 -0600 Subject: [PATCH] Exclude animesh from the AlwaysRenderFriends (and self) complexity exemptions. --- indra/newview/llvoavatar.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f9b36e00d..0c998d5a5 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -8661,11 +8661,13 @@ bool LLVOAvatar::isTooComplex() const { static const LLCachedControl always_render_friends("AlwaysRenderFriends", 0); bool too_complex; - if (isSelf() || (always_render_friends && always_render_friends != 3 && LLAvatarTracker::instance().isBuddy(getID()))) + // 'AlwaysRenderFriends' == 0, or an animesh, falls through to the complexity limits, if not self. Self is always rendered. + // 1 always render friends, 2 render only friends, 3 render only self + if (isSelf() || (always_render_friends && always_render_friends != 3 && !isControlAvatar() && LLAvatarTracker::instance().isBuddy(getID()))) { too_complex = false; } - else if (always_render_friends >= 2) + else if ((always_render_friends >= 2) && !isControlAvatar()) { too_complex = true; }