diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index aee4f4730..19d054606 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12685,11 +12685,11 @@ This should be as low as possible, but too low may break functionality</string>
   <key>AlwaysRenderFriends</key>
     <map>
       <key>Comment</key>
-      <string>Always render friends regardless of max complexity</string>
+      <string>Always render friends regardless of max complexity, a value of 2 will only render friends</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Boolean</string>
+      <string>S32</string>
       <key>Value</key>
       <integer>0</integer>
     </map>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 26f136549..49771ff67 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8628,12 +8628,16 @@ BOOL LLVOAvatar::isFullyLoaded() const
 
 bool LLVOAvatar::isTooComplex() const
 {
-	static const LLCachedControl<bool> always_render_friends("AlwaysRenderFriends", true);
+	static const LLCachedControl<S32> always_render_friends("AlwaysRenderFriends", 0);
 	bool too_complex;
 	if (isSelf() || (always_render_friends && LLAvatarTracker::instance().isBuddy(getID())))
 	{
 		too_complex = false;
 	}
+	else if (always_render_friends == 2)
+	{
+		too_complex = true;
+	}
 	else
 	{
 		// Determine if visually muted or not