diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 089830d63e8eb11738b9f181e1d34cda982473a9..a66291f910304a751d5bb88a0138021d03ff747e 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8337,9 +8337,7 @@ bool LLVOAvatar::isTooComplex() const
 {
 	static const LLCachedControl<bool> always_render_friends(gSavedSettings, "AlwaysRenderFriends", false);
 	bool too_complex;
-	bool render_friend =  (always_render_friends && isInBuddyList());
-
-	if (isSelf() || render_friend || mVisuallyMuteSetting == AV_ALWAYS_RENDER)
+	if (isSelf() || mVisuallyMuteSetting == AV_ALWAYS_RENDER || (always_render_friends && isInBuddyList()))
 	{
 		too_complex = false;
 	}