From ffa43e4e9b7e422d841fd0ff6d63c1d6d86ee900 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 10 Jan 2025 15:55:25 +0100
Subject: [PATCH 1/3] FIRE-35059 French translation update, by  Laurent Bechir

---
 .../xui/fr/panel_snapshot_inventory.xml        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
index 8e43c77227..6ad7f21ce9 100644
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_inventory">
-	<text name="title">Inventaire</text>
+	<text name="title">
+		Inventaire
+	</text>
 	<combo_box label="Résolution" name="texture_size_combo">
 		<combo_box.item label="Petite (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Moyenne (256x256)" name="Medium(256x256)"/>
-		<combo_box.item label="Large (512x512)" name="Large(512x512)"/>
+		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
+		<combo_box.item label="Très grande (1024x1024)" name="Very Large(1024x1024)"/>
+		<combo_box.item label="Énorme (2048x2048)" name="Huge(2048x2048)"/>
 		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
 		<combo_box.item label="Personnalisée" name="Custom"/>
 	</combo_box>
 	<spinner label="Largeur x Hauteur" label_width="100" width="150" name="inventory_snapshot_width"/>
 	<spinner width="50" name="inventory_snapshot_height"/>
 	<check_box label="Conserver les proportions" name="inventory_keep_aspect_check"/>
-	<check_box label="Uploader temporairement" name="inventory_temp_upload"/>
-	<text name="hint_lbl">L&apos;enregistrement d&apos;une image dans l&apos;inventaire coûte [UPLOAD_COST] L$. Pour enregistrer votre image en tant que texture, sélectionnez un des formats listés.</text>
+	<check_box label="Temporaire" name="inventory_temp_upload"/>
+	<text name="hint_lbl">
+		Pour enregistrer votre image en tant que texture, sélectionnez l'un des formats carrés.
+
+Coût du téléversement : [UPLOAD_COST] L$
+	</text>
 	<button label="&#x25B6; Sélection" name="cancel_btn"/>
 	<button label="Enregistrer" name="save_btn"/>
-</panel>
+</panel>
\ No newline at end of file

From fcf96d4e3b0712e709e31c8ff4dffa740540c894 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 10 Jan 2025 22:01:23 +0000
Subject: [PATCH 2/3] FIRE-35010 - (BugSplat) Crash with "filter" input box
 while loading contents

---
 indra/newview/llpanelcontents.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index 74b7c386bb..b1468b7a94 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -177,6 +177,14 @@ void LLPanelContents::getState(LLViewerObject *objectp )
 void LLPanelContents::onFilterEdit()
 {
     const std::string& filter_substring = mFilterEditor->getText();
+    // <FS:Beq> FIRE-35010 Bugsplat crash with filter while loading contents
+    auto root_folder = mPanelInventoryObject->getRootFolder();
+    if (!root_folder)
+    {
+        mPanelInventoryObject->getFilter().setFilterSubString(filter_substring);
+        return;
+    }
+    // </FS:Beq>
     if (filter_substring.empty())
     {
         if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
@@ -186,12 +194,12 @@ void LLPanelContents::onFilterEdit()
         }
 
         mSavedFolderState.setApply(true);
-        mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
+        root_folder->applyFunctorRecursively(mSavedFolderState); // <FS:Beq/> FIRE-35010 Bugsplat crash with filter while loading contents
 
         // Add a folder with the current item to the list of previously opened folders
         LLOpenFoldersWithSelection opener;
-        mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(opener);
-        mPanelInventoryObject->getRootFolder()->scrollToShowSelection();
+        root_folder->applyFunctorRecursively(opener); // <FS:Beq/> FIRE-35010 Bugsplat crash with filter while loading contents
+        root_folder->scrollToShowSelection(); // <FS:Beq/> FIRE-35010 Bugsplat crash with filter while loading contents
     }
     else if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
     {
@@ -199,7 +207,7 @@ void LLPanelContents::onFilterEdit()
         if (!mPanelInventoryObject->getFilter().isNotDefault())
         {
             mSavedFolderState.setApply(false);
-            mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
+            root_folder->applyFunctorRecursively(mSavedFolderState); // <FS:Beq/> FIRE-35010 Bugsplat crash with filter while loading contents
         }
     }
 

From ea2956baafeb258f597c99b752bf018da9d4ac54 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 10 Jan 2025 22:03:13 +0000
Subject: [PATCH 3/3] Fix truly ancient bug that fails to open the content tab
 after a drag/drop event

---
 indra/newview/lltoolcomp.cpp        | 6 +++---
 indra/newview/lltooldraganddrop.cpp | 2 +-
 indra/newview/lltoolindividual.cpp  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 05e931098f..e393a84b3c 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -344,7 +344,7 @@ bool LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)
     {
         // You should already have an object selected from the mousedown.
         // If so, show its properties
-        LLFloaterReg::showInstance("build", "Content");
+        LLFloaterReg::showInstance("build", "Contents");
         return true;
     }
     // Nothing selected means the first mouse click was probably
@@ -463,7 +463,7 @@ bool LLToolCompScale::handleDoubleClick(S32 x, S32 y, MASK mask)
     {
         // You should already have an object selected from the mousedown.
         // If so, show its properties
-        LLFloaterReg::showInstance("build", "Content");
+        LLFloaterReg::showInstance("build", "Contents");
         return true;
     }
     else
@@ -674,7 +674,7 @@ bool LLToolCompRotate::handleDoubleClick(S32 x, S32 y, MASK mask)
     {
         // You should already have an object selected from the mousedown.
         // If so, show its properties
-        LLFloaterReg::showInstance("build", "Content");
+        LLFloaterReg::showInstance("build", "Contents");
         return true;
     }
     else
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 4fca5185db..6629f70843 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1887,7 +1887,7 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
     if (LLFloaterReg::instanceVisible("build"))
     {
         // *FIX: only show this if panel not expanded?
-        LLFloaterReg::showInstance("build", "Content");
+        LLFloaterReg::showInstance("build", "Contents");
     }
 
     // VEFFECT: AddToInventory
diff --git a/indra/newview/lltoolindividual.cpp b/indra/newview/lltoolindividual.cpp
index 8962c55273..14a7b89473 100644
--- a/indra/newview/lltoolindividual.cpp
+++ b/indra/newview/lltoolindividual.cpp
@@ -88,7 +88,7 @@ bool LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
     {
         // You should already have an object selected from the mousedown.
         // If so, show its inventory.
-        LLFloaterReg::showInstance("build", "Content");
+        LLFloaterReg::showInstance("build", "Contents");
         return true;
     }
     else