summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llvoavatar.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 9a798e3b01..a109de6aa5 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8091,9 +8091,11 @@ bool LLVOAvatar::shouldRenderRigged() const
// Maybe better naming could make this clearer?
bool LLVOAvatar::isVisible() const
{
+ static LLCachedControl<bool> friends_only(gSavedSettings, "RenderAvatarFriendsOnly", false);
return mDrawable.notNull()
&& (!mOrphaned || isSelf())
- && (mDrawable->isVisible() || mIsDummy);
+ && (mDrawable->isVisible() || mIsDummy)
+ && (!friends_only() || isUIAvatar() || isSelf() || isControlAvatar() || isBuddy());
}
// Determine if we have enough avatar data to render