From bf7e46ec26c8f0f9f7e578e070be4b2fc2cdf5a8 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 22 May 2024 21:50:50 +0200
Subject: [PATCH 1/4] Add Git attributes file to prevent accidental line ending
 changes

---
 .gitattributes | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..3a4c44aedc
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,35 @@
+* text eol=lf
+
+# VSTool (normalization disabled)
+indra/tools/vstool/* -text
+
+# Images
+*.bmp binary
+*.BMP binary
+*.gif binary
+*.icns binary
+*.ico binary
+*.j2c binary
+*.j2k binary
+*.jpg binary
+*.png binary
+*.tga binary
+*.tif binary
+
+# Viewer resources
+*.db2 binary
+*.llm binary
+*.nib binary
+*.rtf binary
+*.ttf binary
+
+# Executables
+*.dll binary
+*.exe binary
+
+# Files with Windows line endings
+VivoxAUP.txt text eol=crlf
+FILES_ARE_UNICODE_UTF-16LE.txt text eol=crlf
+
+# Windows Manifest files
+*.manifest text eol=crlf

From 3c00b5f751ac3f1d5ed7f0d99034f5153dec6aa4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 May 2024 08:40:00 +0300
Subject: [PATCH 2/4] triage#59 Cover cases where some attachments stayed
 visible

---
 indra/newview/llvoavatar.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

From 7f4a4bc110dbd35637ae043e097e85c0378b98e8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 May 2024 14:56:02 +0300
Subject: [PATCH 3/4] viewer-private#238 Complexity mode should persist

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 59c021d92a..5834bfafc5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9225,7 +9225,7 @@
         <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>

From 6377610f6587989c126b00f490dfc8d527a1c2ce Mon Sep 17 00:00:00 2001
From: Brad Linden <46733234+brad-linden@users.noreply.github.com>
Date: Thu, 23 May 2024 11:23:50 -0700
Subject: [PATCH 4/4] Protect NSIS scripts from eol-style translations. (#1556)

---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

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