diff --git a/.gitattributes b/.gitattributes
index 3a4c44aedc..30cc9de8f1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -33,3 +33,6 @@ FILES_ARE_UNICODE_UTF-16LE.txt text eol=crlf
 
 # Windows Manifest files
 *.manifest text eol=crlf
+
+# Windows Installer Script files (normalization disabled)
+*.nsi -text
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 33c23032bd..45b3ce5d30 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12948,7 +12948,7 @@ Change of this parameter will affect the layout of buttons in notification toast
         <key>Comment</key>
         <string>0 - complexity limit applies to everyone, 1 - always show friends, 2 - only show friends</string>
         <key>Persist</key>
-        <integer>0</integer>
+        <integer>1</integer>
         <key>Type</key>
         <string>S32</string>
         <key>Value</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index bce31bbde9..2f4e39827a 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -9018,9 +9018,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