From 69b405553ff550fab230ef7624e6dd487302452f Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 19 Jul 2024 16:31:49 +0100
Subject: [PATCH 1/7] Updated VRAM reporting logic on Linux

Modified the condition for using NVXMemInfo in LLWindowSDL. Now, it will only use accurate feedback onNVidia if there's no override being used.
---
 indra/llwindow/llwindowsdl2.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llwindow/llwindowsdl2.cpp b/indra/llwindow/llwindowsdl2.cpp
index 7c877c8ba7..8128d33619 100644
--- a/indra/llwindow/llwindowsdl2.cpp
+++ b/indra/llwindow/llwindowsdl2.cpp
@@ -2691,7 +2691,8 @@ U32 LLWindowSDL::getAvailableVRAMMegabytes()
     return gGLManager.mVRAM - (LLImageGL::getTextureBytesAllocated() * total_factor/mb);
 */
     LL_PROFILE_ZONE_SCOPED;
-    if (gGLManager.mHasNVXMemInfo)
+    // Only use the accurate feedback if we are not using an override
+    if (gGLManager.mHasNVXMemInfo && gGLManager.mVRAM == gGLManager.mVRAMDetected)
     {
         S32 available_memory;
         glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &available_memory);

From 3dc98a12921ad5321d4293d3aa625d35b68aad6f Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sat, 20 Jul 2024 13:20:42 +0200
Subject: [PATCH 2/7] fire-34309 fire-34311 updated french (laurent bechir) and
 russian (romka swallowtail) translations

---
 indra/newview/skins/default/xui/fr/floater_camera.xml         | 2 ++
 .../newview/skins/default/xui/fr/floater_fs_camera_small.xml  | 2 ++
 indra/newview/skins/default/xui/ru/floater_camera.xml         | 4 +++-
 .../newview/skins/default/xui/ru/floater_fs_camera_small.xml  | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index b87d0619f8..3e4c995885 100644
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -17,6 +17,8 @@
 		<layout_stack name="camera_view_layout_stack">
 			<layout_panel name="camera_rotate_layout_panel">
 				<joystick_rotate name="cam_rotate_stick" tool_tip="Faire tourner la caméra autour du point central"/>
+				<button name="roll_left" tool_tip="Faire pivoter la caméra vers la gauche"/>
+				<button name="roll_right" tool_tip="Faire pivoter la caméra vers la droite"/>
 			</layout_panel>
 			<layout_panel name="camera_zoom_layout_panel">
 				<slider_bar name="zoom_slider" tool_tip="Zoomer en direction du point central"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_fs_camera_small.xml b/indra/newview/skins/default/xui/fr/floater_fs_camera_small.xml
index 7cc629b60a..966253014f 100644
--- a/indra/newview/skins/default/xui/fr/floater_fs_camera_small.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fs_camera_small.xml
@@ -13,6 +13,8 @@
 		<layout_stack name="camera_view_layout_stack">
 			<layout_panel name="camera_rotate_layout_panel">
 				<joystick_rotate name="cam_rotate_stick" tool_tip="Faites pivoter la caméra autour du sujet" />
+				<button name="roll_left" tool_tip="Faire pivoter la caméra vers la gauche"/>
+				<button name="roll_right" tool_tip="Faire pivoter la caméra vers la droite"/>
 			</layout_panel>
 			<layout_panel name="camera_zoom_layout_panel">
 				<slider_bar name="zoom_slider" tool_tip="Zoomez sur le sujet" />
diff --git a/indra/newview/skins/default/xui/ru/floater_camera.xml b/indra/newview/skins/default/xui/ru/floater_camera.xml
index 8d78746033..2446faeadc 100644
--- a/indra/newview/skins/default/xui/ru/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ru/floater_camera.xml
@@ -25,6 +25,8 @@
 		<layout_stack name="camera_view_layout_stack">
 			<layout_panel name="camera_rotate_layout_panel">
 				<joystick_rotate name="cam_rotate_stick" tool_tip="Вращение камеры вокруг точки фокусировки"/>
+				<button name="roll_left" tool_tip="Вращать камеру влево"/>
+				<button name="roll_right" tool_tip="Вращать камеру вправо"/>
 			</layout_panel>
 			<layout_panel name="camera_zoom_layout_panel">
 				<slider_bar name="zoom_slider" tool_tip="Приблизить/отдалить камеру к/от точки фокусировки"/>
@@ -42,4 +44,4 @@
 		</combo_box>
 		<button name="gear_btn" tool_tip="Предустановки Камеры"/>
 	</panel>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_fs_camera_small.xml b/indra/newview/skins/default/xui/ru/floater_fs_camera_small.xml
index 1f418f5f40..22da0203b7 100644
--- a/indra/newview/skins/default/xui/ru/floater_fs_camera_small.xml
+++ b/indra/newview/skins/default/xui/ru/floater_fs_camera_small.xml
@@ -13,6 +13,8 @@
         <layout_stack name="camera_view_layout_stack">
             <layout_panel name="camera_rotate_layout_panel">
                 <joystick_rotate name="cam_rotate_stick" tool_tip="Вращение камеры вокруг точки фокусировки"/>
+                <button name="roll_left" tool_tip="Вращать камеру влево"/>
+                <button name="roll_right" tool_tip="Вращать камеру вправо"/>
             </layout_panel>
             <layout_panel name="camera_zoom_layout_panel">
                 <slider_bar name="zoom_slider" tool_tip="Приблизить/отдалить камеру к/от точки фокусировки"/>

From cf3314340b515d79afc1dfa1733031acd6da0573 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 26 Jul 2024 15:16:07 +0200
Subject: [PATCH 3/7] Fix broken texture panel when not using new layout

---
 indra/newview/llpanelface.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 5f2718e54a..0d41439e41 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -603,8 +603,6 @@ LLPanelFace::LLPanelFace()
     mTitleMediaText(NULL),
     mNeedMediaTitle(true)
 {
-    buildFromFile("panel_tools_texture.xml");    // <FS:Zi> switchable edit texture/materials
-
     USE_TEXTURE = LLTrans::getString("use_texture");
     // <FS> Extended copy & paste buttons
     //mCommitCallbackRegistrar.add("PanelFace.menuDoToSelected", boost::bind(&LLPanelFace::menuDoToSelected, this, _2));
@@ -612,8 +610,11 @@ LLPanelFace::LLPanelFace()
     // </FS>
 
     // <FS:Zi> Find all faces with same texture
+    mCommitCallbackRegistrar.add("BuildTool.Flip", boost::bind(&LLPanelFace::onCommitFlip, _1, _2));
     mCommitCallbackRegistrar.add("BuildTool.SelectSameTexture", boost::bind(&LLPanelFace::onClickBtnSelectSameTexture, this, _1, _2));
     // </FS:Zi>
+
+    buildFromFile("panel_tools_texture.xml");    // <FS:Zi> switchable edit texture/materials
 }
 
 LLPanelFace::~LLPanelFace()

From ce536fd5f37696cd1aed868edf9f64a00f0e427e Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 27 Jul 2024 08:13:14 +0100
Subject: [PATCH 4/7] mac packaging: exit loop cleanly on hdi detach success

---
 indra/newview/viewer_manifest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 568d0a41b4..6d8c4756ed 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1913,6 +1913,7 @@ class Darwin_x86_64_Manifest(ViewerManifest):
             for tries in range(10):
                 try:
                     self.run_command(['hdiutil', 'detach', '-force', devfile])
+                    break # Exit loop if detach worked
                 except ManifestError as err:
                     print(f"detach failed on attempt {tries}")
                     time.sleep(1)

From e157a2db35a6fe9b106376d710fc83c69b5774da Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 27 Jul 2024 12:00:44 +0200
Subject: [PATCH 5/7] Move PR guidelines doc to doc folder

---
 README.md                                      | 2 +-
 FS_PR_GUIDELINES.md => doc/FS_PR_GUIDELINES.md | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename FS_PR_GUIDELINES.md => doc/FS_PR_GUIDELINES.md (100%)

diff --git a/README.md b/README.md
index 0943130420..e78a22fd54 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,4 @@ Build instructions for each operating system can be found using the links below
 
 ## Contribute
 
-Help make Firestorm better! You can get involved with improvements by filing bugs and suggesting enhancements via [JIRA](https://jira.firestormviewer.org) or [creating pull requests](FS_PR_GUIDELINES.md).
+Help make Firestorm better! You can get involved with improvements by filing bugs and suggesting enhancements via [JIRA](https://jira.firestormviewer.org) or [creating pull requests](doc/FS_PR_GUIDELINES.md).
diff --git a/FS_PR_GUIDELINES.md b/doc/FS_PR_GUIDELINES.md
similarity index 100%
rename from FS_PR_GUIDELINES.md
rename to doc/FS_PR_GUIDELINES.md

From ff891ca38d1a8d84bc1676020f6ac1272964e81e Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 29 Jul 2024 21:30:58 +0100
Subject: [PATCH 6/7] FIRE-34277 - particles are refusing to rez

Oddly, calling getPixelArea() before calcPixelArea() is correct. This makes no sense but things break if we don't!
---
 indra/newview/llviewertexturelist.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 80e9fcb089..a0b97cc86e 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -915,13 +915,13 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
 
                 if (face && face->getViewerObject() && face->getTextureEntry())
                 {
+                    F32 vsize = face->getPixelArea();
 // <FS:Beq> Fix Blurry textures and use importance weight
                     F32 radius;
                     F32 cos_angle_to_view_dir;
                     BOOL in_frustum = face->calcPixelArea(cos_angle_to_view_dir, radius);
                     static LLCachedControl<F32> bias_unimportant_threshold(gSavedSettings, "TextureBiasUnimportantFactor", 0.25f);
 // </FS:Beq>
-                    F32 vsize = face->getPixelArea();
 
                     // scale desired texture resolution higher or lower depending on texture scale
                     const LLTextureEntry* te = face->getTextureEntry();

From 73788b2c67fffffdd29cce40d99f1aa01912fa3e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 30 Jul 2024 10:31:13 +0200
Subject: [PATCH 7/7] FIRE-34348: Update outdated tool tip for point lights

---
 .../skins/default/xui/de/panel_preferences_graphics1.xml        | 2 +-
 .../skins/default/xui/en/panel_preferences_graphics1.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index 763493f4b8..b99e651361 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -70,7 +70,7 @@
 			<combo_box.item label="Alle Avatare und Objekte" name="3"/>
 			<combo_box.item label="Alles" name="4"/>
 		</combo_box>
-		<text name="local lights_label" tool_tip="Beeinflusst die Anzahl an dargestellten Lichtquellen, wenn Erweitertes Beleuchtungsmodell aktiviert ist (Neustart erforderlich).">
+		<text name="local lights_label" tool_tip="Beeinflusst die Anzahl an dargestellten Lichtquellen (Neustart erforderlich).">
 			Punkt. Beleucht. (Neustart erf.):
 		</text>
 		<combo_box name="LocalLightsDetail">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index c23b69d2b5..98acbce12f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -404,7 +404,7 @@
          layout="topleft"
          left_delta="-5"
          name="local lights_label"
-         tool_tip="Affects the number of rendered light sources when Advanced Lighting Model is disabled. A restart is required to change mode.">
+         tool_tip="Affects the number of rendered. A restart is required to change mode.">
           Point Lighting (restart required)
         </text>
         <combo_box