From e5be0b6ee1b3c74ff7f1b35c2946869fa79a893b Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 19 Apr 2021 11:34:41 +0200
Subject: [PATCH 01/10] FMOD update to 2.01.09 on Windows

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index dce83a2bb2..f2d2981bf4 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1022,11 +1022,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c27de9c2f8c562551773a80399d6d037</string>
+              <string>215de14980a03774795de8cde24f1ad5</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.08-windows-210431451.tar.bz2</string>
+              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.09-windows-211090925.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1036,18 +1036,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>29a66f79f7224cc17aa22d047853f7b0</string>
+              <string>a55f9ae859a5a60285f0c6c764729194</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.08-windows64-210431454.tar.bz2</string>
+              <string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.09-windows64-211090927.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.01.08</string>
+        <string>2.01.09</string>
       </map>
       <key>fontconfig</key>
       <map>

From dcfb67f7fe2b43bf587d956610b8d52ef51734e5 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Tue, 20 Apr 2021 15:19:23 +0200
Subject: [PATCH 02/10] FIRE-30923 French translation update, by Laurent Bechir

---
 indra/newview/skins/default/xui/fr/floater_select_key.xml | 4 ++--
 indra/newview/skins/default/xui/fr/menu_hide_navbar.xml   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/floater_select_key.xml b/indra/newview/skins/default/xui/fr/floater_select_key.xml
index c1616b795e..ed9d7136c3 100644
--- a/indra/newview/skins/default/xui/fr/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/fr/floater_select_key.xml
@@ -7,7 +7,7 @@
 		Boutons de la souris
 	</floater.string>
 	<floater.string name="basic_description">
-		Appuyez sur une touche ou un bouton de la souris pour régler votre déclencheur..
+		Appuyez sur une touche ou un bouton de la souris pour régler votre déclencheur.
 Saisie autorisée : [INPUT].
 	</floater.string>
 	<floater.string name="reserved_by_menu">
@@ -17,7 +17,7 @@ Saisie autorisée : [INPUT].
 		Appuyez sur une touche ou un bouton de la souris pour régler votre déclencheur.
 Saisie autorisée : [INPUT].
 	</text>
-	<check_box label="Appliquer à tous" name="apply_all" tool_tip="Viewer uses different control combinations depending on what you are doing in world, setting this will apply your change to all combinations"/>
+	<check_box label="Appliquer à tous" name="apply_all" tool_tip="La visionneuse utilise différentes combinaisons de commandes en fonction de ce que vous faites en ligne. En cochant cette option, vous appliquerez vos modifications à toutes les combinaisons."/>
 	<button label="Vide" name="SetEmpty"/>
 	<button label="Défaut" name="Default"/>
 	<button label="Annuler" name="Cancel"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
index 44875344ec..567ee88a2d 100644
--- a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
@@ -7,4 +7,9 @@
 	<menu_item_check label="Afficher la version du simulateur dans la barre supérieure" name="FSStatusbarShowSimulatorVersion"/>
 	<menu_item_check label="Afficher la recherche dans les menus" name="FSMenuSearch"/>
 	<menu_item_check label="Afficher le solde de devises" name="FSShowCurrencyBalanceInStatusbar"/>
+	<menu_item_check label="Afficher les contrôles des médias" name="FSEnableVolumeControls"/>
+	<menu_item_check label="Afficher le nombre d'images par seconde" name="FSStatusBarShowFPS"/>
+	<menu_item_check label="Afficher l'indicateur de trafic" name="ShowNetStats"/>
+	<menu_item_check label="Afficher les coordonnées" name="Coordinates"/>
+	<menu_item_check label="Afficher les autorisations de la parcelle" name="Parcel Properties"/>
 </menu>

From c7d6f131beec0693375247eba5587712b59c8839 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Tue, 20 Apr 2021 15:24:56 +0200
Subject: [PATCH 03/10] Prevent credits section from being cut off

---
 indra/newview/skins/default/xui/en/floater_about.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index b71591f5e5..13ae3186e7 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -91,7 +91,7 @@ Dummy Name replaced at run time
       </text_editor>
     </panel>
     <panel
-      height="855"
+      height="885"
       border="true"
       label="Firestorm Credits"
       help_topic="about_fscredits_tab"
@@ -156,7 +156,7 @@ Additional code generously contributed to Firestorm by:
                 <text
                  enabled="false"
                  follows="top|left"
-                 height="185"
+                 height="215"
                  bg_readonly_color="Transparent"
                  left="5"
                  text_color="LtGray"

From af2fd2178044fdc1146e34bf720baf190577f55e Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Tue, 20 Apr 2021 15:31:30 +0200
Subject: [PATCH 04/10] Linux; Update fmodstudio to 2.01.09.

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index f2d2981bf4..d72b19361a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1008,11 +1008,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c8024bad0445af488d355670ba13cc40</string>
+              <string>65d60415962cf65918c4fabe379ad43a</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///opt/firestorm/fmodstudio-2.01.08-linux64-210441517.tar.bz2</string>
+              <string>file:///opt/firestorm/fmodstudio-2.01.09-linux64-211101316.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>

From 7442c3d685c1ec0bd1c5e722a6f8f81e95d904b2 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 20 Apr 2021 19:19:27 +0200
Subject: [PATCH 05/10] Fix apparent logic flaw

---
 indra/llmessage/llcachename.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index cd2c6eb593..851bdb41af 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -574,7 +574,7 @@ std::string LLCacheName::buildFullName(const std::string& first, const std::stri
 std::string LLCacheName::cleanFullName(const std::string& full_name)
 {
 // <FS:CR> FIRE-6659: Legacy "Resident" name toggle
-	return (LLAvatarName::trimResidentSurname() ? full_name : full_name.substr(0, full_name.find(" Resident")));
+	return (!LLAvatarName::trimResidentSurname() ? full_name : full_name.substr(0, full_name.find(" Resident")));
 // </FS:CR> FIRE-6659: Legacy "Resident" name toggle
 }
 

From 065bde8514ae42f268052e1fbde0c8659d9cef2d Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 20 Apr 2021 20:26:53 +0200
Subject: [PATCH 06/10] Fix muted avatars without lastname being able to send
 group invites

---
 indra/newview/llimprocessing.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 1fb4b77094..df2c2dbcbd 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -1280,7 +1280,19 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
                 // group is not blocked, but we still need to check agent that sent the invitation
                 // and we have no agent's id
                 // Note: server sends username "first.last".
-                is_muted |= LLMuteList::getInstance()->isMuted(name);
+                // <FS:Ansariel> Fix broken mute check for avatars without last name:
+                //               Names without last names are stored with capital first letter
+                //               in the mute list, but they arrive here completely in lower case.
+                //               So we need to change the first letter to upper case in order to
+                //               make the mute check actually work.
+                //is_muted |= LLMuteList::getInstance()->isMuted(name);
+                std::string check_name(name);
+                if (!check_name.empty() && check_name.find('.') == std::string::npos)
+                {
+                    check_name[0] = toupper(check_name[0]);
+                }
+                is_muted |= LLMuteList::getInstance()->isMuted(check_name);
+                // </FS:Ansariel>
             }
             if (is_do_not_disturb || is_muted)
             {

From a288d08792198f2eb5d15de110183b82a2a0021e Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Fri, 23 Apr 2021 16:47:31 +0200
Subject: [PATCH 07/10] FIRE-30925 Small Russian translation update, by Romka
 Swallowtail

---
 indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
index 234b09ad31..5f97758100 100644
--- a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
@@ -27,6 +27,6 @@
 	<button label="Сброс" label_selected="Сброс" name="Reset"/>
 	<check_box initial_value="true" label="Выполняется" name="running"/>
 	<check_box initial_value="true" label="Моно" name="mono"/>
-	<check_box label="Использовать приключение:" name="enable_xp"/>
+	<check_box label="Исп. приключение:" name="enable_xp"/>
 	<button label="&gt;" name="view_profile"/>
 </floater>

From 0a77c80908101276a9a5d2aa376ea4a717a3a1f8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 21 Apr 2021 18:27:04 +0300
Subject: [PATCH 08/10] SL-15152 Crashfix: Do not update environments when
 quiting

---
 indra/newview/llenvironment.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 95ec93d823..a9afd3b72d 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -2074,6 +2074,10 @@ void LLEnvironment::coroRequestEnvironment(S32 parcel_id, LLEnvironment::environ
     {
         LL_WARNS("ENVIRONMENT") << "Couldn't retrieve environment settings for " << ((parcel_id == INVALID_PARCEL_ID) ? ("region!") : ("parcel!")) << LL_ENDL;
     }
+    else if (LLApp::isExiting())
+    {
+        return;
+    }
     else
     {
         LLSD environment = result[KEY_ENVIRONMENT];
@@ -2163,6 +2167,10 @@ void LLEnvironment::coroUpdateEnvironment(S32 parcel_id, S32 track_no, UpdateInf
         notify = LLSD::emptyMap();
         notify["FAIL_REASON"] = result["message"].asString();
     }
+    else if (LLApp::isExiting())
+    {
+        return;
+    }
     else
     {
         LLSD environment = result[KEY_ENVIRONMENT];
@@ -2225,6 +2233,10 @@ void LLEnvironment::coroResetEnvironment(S32 parcel_id, S32 track_no, environmen
         notify = LLSD::emptyMap();
         notify["FAIL_REASON"] = result["message"].asString();
     }
+    else if (LLApp::isExiting())
+    {
+        return;
+    }
     else
     {
        LLSD environment = result[KEY_ENVIRONMENT];

From 9a96c2b82fe9089b1b35b0d8c5e393b964792794 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 22 Apr 2021 00:28:45 +0300
Subject: [PATCH 09/10] SL-14977 Extended AltGr to cover oem symbols

Typing '}' via 'altgr+=' into a script makes the viewer to derender particles
---
 indra/llwindow/llwindowwin32.h   | 3 +++
 indra/newview/llviewerwindow.cpp | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index 3d76ab76f3..618900b7b3 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -124,6 +124,9 @@ public:
 
     /*virtual*/ void* getDirectInput8();
     /*virtual*/ bool getInputDevices(U32 device_type_filter, void * di8_devices_callback, void* userdata);
+
+    U32 getRawWParam() { return mRawWParam; }
+
 protected:
 	LLWindowWin32(LLWindowCallbacks* callbacks,
 		const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, 
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 608c95f222..8581eaac6c 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -237,6 +237,7 @@
 
 #if LL_WINDOWS
 #include <tchar.h> // For Unicode conversion methods
+#include "llwindowwin32.h" // For AltGr handling
 #endif
 
 #include "utilitybar.h"		// <FS:Zi> Support for the classic V1 style buttons in some skins
@@ -3183,9 +3184,11 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
         // of character handling.
         // Alt Gr can be additionally modified by Shift
         const MASK alt_gr = MASK_CONTROL | MASK_ALT;
+        LLWindowWin32 *window = static_cast<LLWindowWin32*>(mWindow);
+        U32 raw_key = window->getRawWParam();
         if ((mask & alt_gr) != 0
-            && key >= 0x30
-            && key <= 0x5A
+            && ((raw_key >= 0x30 && raw_key <= 0x5A) //0-9, plus normal chartacters
+                || (raw_key >= 0xBA && raw_key <= 0xE4)) // Misc/OEM characters that can be covered by AltGr, ex: -, =, ~
             && (GetKeyState(VK_RMENU) & 0x8000) != 0
             && (GetKeyState(VK_RCONTROL) & 0x8000) == 0) // ensure right control is not pressed, only left one
         {

From d07980268fd8facf78507fdf50e7567ca3cd9839 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 24 Apr 2021 01:00:21 +0300
Subject: [PATCH 10/10] SL-15150 Crash at
 LLScrollColumnHeader::updateResizeBars

Looks like mHeader is invalid yet mHeader->updateResizeBars() gets called, decided to validate column pointer
---
 indra/llui/llscrolllistcolumn.cpp | 4 ++--
 indra/llui/llscrolllistctrl.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp
index cc9ff7a487..82b0415624 100644
--- a/indra/llui/llscrolllistcolumn.cpp
+++ b/indra/llui/llscrolllistcolumn.cpp
@@ -257,7 +257,7 @@ void LLScrollColumnHeader::updateResizeBars()
 	for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
 	{
 		LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
-		if (columnp->mHeader && columnp->mHeader->canResize())
+		if (columnp && columnp->mHeader && columnp->mHeader->canResize())
 		{
 			num_resizable_columns++;
 		}
@@ -269,7 +269,7 @@ void LLScrollColumnHeader::updateResizeBars()
 	for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
 	{
 		LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
-		if (!columnp->mHeader) continue;
+		if (!columnp || !columnp->mHeader) continue;
 		BOOL enable = num_resizable_columns >= 2 && num_resizers_enabled < (num_resizable_columns - 1) && columnp->mHeader->canResize();
 		columnp->mHeader->enableResizeBar(enable);
 		if (enable)
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 71b5340d11..98c0919800 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -833,12 +833,12 @@ void LLScrollListCtrl::updateColumns(bool force_update)
 	LLScrollColumnHeader* last_header = NULL;
 	for (column_ordered_it = mColumnsIndexed.begin(); column_ordered_it != mColumnsIndexed.end(); ++column_ordered_it)
 	{
-		if ((*column_ordered_it)->getWidth() < 0)
+		LLScrollListColumn* column = *column_ordered_it;
+		if (!column || column->getWidth() < 0)
 		{
 			// skip hidden columns
 			continue;
 		}
-		LLScrollListColumn* column = *column_ordered_it;
 		
 		if (column->mHeader)
 		{