From 6fbbd77f5c63073ff34b3edb388cee054f48876f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 18 May 2023 23:17:01 +0200
Subject: [PATCH 1/9] Fix incoming IM announcement showing timestamp 00:00

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

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 917618d49e..4e505557ad 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -4476,6 +4476,7 @@ void typingNameCallback(const LLUUID& av_id, const LLAvatarName& av_name, const
 			LLUUID::null,
 			LLVector3::zero,
 			false,
+			0,
 			true
 			);
 	}
@@ -4548,6 +4549,7 @@ void typingNameCallback(const LLUUID& av_id, const LLAvatarName& av_name, const
 			LLUUID::null,
 			LLVector3::zero,
 			false,
+			0,
 			true
 			);
 
@@ -4570,6 +4572,7 @@ void typingNameCallback(const LLUUID& av_id, const LLAvatarName& av_name, const
 						LLUUID::null,
 						LLVector3::zero,
 						false,
+						0,
 						true);
 				LLGiveInventory::doGiveInventoryItem(av_id, item, session_id);
 			}

From f22a84d21223f20897d1d2e5306e771bddf53dbb Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 19 May 2023 16:37:56 +0200
Subject: [PATCH 2/9] FIRE-32965 French translation update, by Laurent Bechir

---
 indra/newview/skins/default/xui/fr/mime_types.xml          | 7 ++++++-
 indra/newview/skins/default/xui/fr/mime_types_linux.xml    | 5 +++++
 indra/newview/skins/default/xui/fr/mime_types_mac.xml      | 5 +++++
 .../skins/default/xui/fr/panel_preferences_general.xml     | 2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml
index be36400ef5..a70e088e6f 100644
--- a/indra/newview/skins/default/xui/fr/mime_types.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types.xml
@@ -127,7 +127,12 @@
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			Site web (XHTML)
+			Page Web (XHTML)
+		</label>
+	</mimetype>
+	<mimetype name="application/octet-stream">
+		<label name="application/octet-stream_label">
+			Flux
 		</label>
 	</mimetype>
 	<mimetype name="audio/mid">
diff --git a/indra/newview/skins/default/xui/fr/mime_types_linux.xml b/indra/newview/skins/default/xui/fr/mime_types_linux.xml
index 5bdcd1e6f2..427db4c936 100644
--- a/indra/newview/skins/default/xui/fr/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types_linux.xml
@@ -120,6 +120,11 @@
 			Page Web (XHTML)
 		</label>
 	</mimetype>
+	<mimetype name="application/octet-stream">
+		<label name="application/octet-stream_label">
+			Flux
+		</label>
+	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
 			Audio (MIDI)
diff --git a/indra/newview/skins/default/xui/fr/mime_types_mac.xml b/indra/newview/skins/default/xui/fr/mime_types_mac.xml
index 004018a943..68fea7082c 100644
--- a/indra/newview/skins/default/xui/fr/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types_mac.xml
@@ -120,6 +120,11 @@
 			Page Web (XHTML)
 		</label>
 	</mimetype>
+	<mimetype name="application/octet-stream">
+		<label name="application/octet-stream_label">
+			Flux
+		</label>
+	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
 			Audio (MIDI)
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 63e5cdb708..6949e04800 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -3,6 +3,8 @@
 	<text name="language_textbox">Langue :</text>
 	<combo_box name="language_combobox">
 		<combo_box.item label="English (Anglais)" name="English"/>
+		<!-- <combo_box.item label="Azərbaycanca (Azerbaïdjanais)" name="Azerbaijani"/> -->
+		<!-- <combo_box.item label="Dansk (Danois) - Beta" name="Danish"/> -->
 		<combo_box.item label="Deutsch (Allemand)" name="Deutsch(German)"/>
 		<combo_box.item label="Español (Espagnol) - Beta" name="Spanish"/>
 		<combo_box.item label="Français - Beta" name="French"/>

From ef0b3d42bee69984e060e0a1f6dd490290d607ef Mon Sep 17 00:00:00 2001
From: Pork Chop <mygoditsfullofstars@phoenixviewer.com>
Date: Sun, 21 May 2023 17:28:47 +1000
Subject: [PATCH 3/9] Linux: Fix broken build

---
 indra/newview/llfilepicker.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index bdb03f287b..f5e06efb71 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -1724,6 +1724,36 @@ BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter, bool blocking)
 }
 
 #elif LL_FLTK
+
+BOOL LLFilePicker::getOpenFileModeless(ELoadFilter filter,
+                                       void (*callback)(bool, std::vector<std::string> &, void*),
+                                       void *userdata)
+{
+    // not supposed to be used yet, use LLFilePickerThread
+    LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
+    return FALSE;
+}
+
+
+BOOL LLFilePicker::getMultipleOpenFilesModeless(ELoadFilter filter,
+                                                void (*callback)(bool, std::vector<std::string> &, void*),
+                                                void *userdata )
+{
+    // not supposed to be used yet, use LLFilePickerThread
+    LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
+    return FALSE;
+}
+
+BOOL LLFilePicker::getSaveFileModeless(ESaveFilter filter,
+                                       const std::string& filename,
+                                       void (*callback)(bool, std::string&, void*),
+                                       void *userdata)
+{
+    // not supposed to be used yet, use LLFilePickerThread
+    LL_ERRS() << "NOT IMPLEMENTED" << LL_ENDL;
+    return FALSE;
+}
+
 BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename, bool blocking )
 {
 	return openFileDialog( filter, blocking, eSaveFile );

From e83eb13ae8a691d07f0c495059bfd5e8b040a248 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 21 May 2023 21:31:22 +0100
Subject: [PATCH 4/9] MacOs:Maybe fix broken build

Last build stopped after these 5 symbols were not found. might be other errors lurking.
---
 indra/newview/llfilepicker.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index f5e06efb71..5372969e5f 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -876,25 +876,25 @@ void set_nav_save_data(LLFilePicker::ESaveFilter filter, std::string &extension,
             break;
 
         // <FS:CR> Export filter
-        case FFSAVE_EXPORT:
+        case LLFilePicker::FFSAVE_EXPORT:
             type = "OXP ";
             creator = "\?\?\?\?";
             extension = "oxp";
             break;
-        case FFSAVE_COLLADA:
+        case LLFilePicker::FFSAVE_COLLADA:
             type = "DAE ";
             creator = "\?\?\?\?";
             extension = "dae";
             break;
         // <FS:CR> CSV Filter
-        case FFSAVE_CSV:
+        case LLFilePicker::FFSAVE_CSV:
             type = "CSV ";
             creator = "\?\?\?\?";
             extension = "csv";
             break;
         // </FS:CR>
-        case FFSAVE_BEAM:
-        case FFSAVE_XML:
+        case LLFilePicker::FFSAVE_BEAM:
+        case LLFilePicker::FFSAVE_XML:
             type = "XML ";
             creator = "\?\?\?\?";
             extension = "xml";

From 9931ce4791366a13094f96786b39618004202243 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 21 May 2023 23:37:41 +0200
Subject: [PATCH 5/9] FIRE-32973 Russian translation update, by Romka
 Swallowtail

---
 indra/newview/skins/default/xui/ru/mime_types.xml       | 5 +++++
 indra/newview/skins/default/xui/ru/mime_types_linux.xml | 5 +++++
 indra/newview/skins/default/xui/ru/mime_types_mac.xml   | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/indra/newview/skins/default/xui/ru/mime_types.xml b/indra/newview/skins/default/xui/ru/mime_types.xml
index cfb7208049..76f2895f0c 100644
--- a/indra/newview/skins/default/xui/ru/mime_types.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types.xml
@@ -212,6 +212,11 @@
 			Видео (MP4)
 		</label>
 	</mimetype>
+	<mimetype name="video/x-flv">
+		<label name="video/x-flv_label">
+			Видео (flv)
+		</label>
+	</mimetype>
 	<mimetype name="application/octet-stream">
 		<label name="video/octet-stream">
 			Видео
diff --git a/indra/newview/skins/default/xui/ru/mime_types_linux.xml b/indra/newview/skins/default/xui/ru/mime_types_linux.xml
index 6feb64679c..6c4538d737 100644
--- a/indra/newview/skins/default/xui/ru/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types_linux.xml
@@ -202,6 +202,11 @@
 			Видео (MP4)
 		</label>
 	</mimetype>
+	<mimetype name="video/x-flv">
+		<label name="video/x-flv_label">
+			Видео (flv)
+		</label>
+	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
 			Видео (QuickTime)
diff --git a/indra/newview/skins/default/xui/ru/mime_types_mac.xml b/indra/newview/skins/default/xui/ru/mime_types_mac.xml
index 9b120f2f40..8a1a14e8e2 100644
--- a/indra/newview/skins/default/xui/ru/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types_mac.xml
@@ -202,6 +202,11 @@
 			Видео (MP4)
 		</label>
 	</mimetype>
+	<mimetype name="video/x-flv">
+		<label name="video/x-flv_label">
+			Видео (flv)
+		</label>
+	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
 			Видео (QuickTime)

From ba0ea85d5203b3b1a771ea4d3ec8ac847690718a Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 21 May 2023 23:51:18 +0200
Subject: [PATCH 6/9] FIRE-32972 Fix the SL Grid Status error message by
 modifying the path, as the format seemingly changed

---
 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 15e538662a..4dcf7dd3c3 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7741,7 +7741,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>https://status.secondlifegrid.net/history.atom</string>
+      <string>https://status.secondlifegrid.net/history.rss</string>
     </map>
     <key>GridStatusUpdateDelay</key>
     <map>

From 3469577978341bc96b194c7f2dd908c62eae78de Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Mon, 22 May 2023 18:32:53 +0200
Subject: [PATCH 7/9] FIRE-32944 - Hide some items if texture is invalid

---
 indra/newview/llfloaterimagepreview.cpp | 35 ++++++++++++++++---------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index 244e47b706..65f9bc8578 100644
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -123,6 +123,12 @@ BOOL LLFloaterImagePreview::postBuild()
 
 	getChildView("bad_image_text")->setVisible(FALSE);
 
+	// <FS:PP> FIRE-32944 - Hide some items if texture is invalid
+	LLCheckBoxCtrl* temp_check = getChild<LLCheckBoxCtrl>("temp_check");
+	LLCheckBoxCtrl* lossless_check = getChild<LLCheckBoxCtrl>("lossless_check");
+	LLUICtrl* uploaded_size_text = getChild<LLUICtrl>("uploaded_size_text");
+	// </FS:PP>
+
 	if (mRawImagep.notNull() && gAgent.getRegion() != NULL)
 	{
 		mAvatarPreview = new LLImagePreviewAvatar(256, 256);
@@ -142,16 +148,14 @@ BOOL LLFloaterImagePreview::postBuild()
         //}
 		if (mRawImagep->getWidth() * mRawImagep->getHeight () <= LL_IMAGE_REZ_LOSSLESS_CUTOFF * LL_IMAGE_REZ_LOSSLESS_CUTOFF)
 		{
-			LLCheckBoxCtrl* check_box = getChild<LLCheckBoxCtrl>("lossless_check");
-			check_box->setEnabled(TRUE);
-			check_box->setVisible(TRUE);
-			check_box->setControlVariable(gSavedSettings.getControl("LosslessJ2CUpload"));
+			lossless_check->setEnabled(TRUE);
+			lossless_check->setVisible(TRUE);
+			lossless_check->setControlVariable(gSavedSettings.getControl("LosslessJ2CUpload"));
 		}
 		else
 		{
-			LLCheckBoxCtrl* check_box = getChild<LLCheckBoxCtrl>("lossless_check");
-			check_box->setEnabled(FALSE);
-			check_box->setVisible(FALSE);
+			lossless_check->setEnabled(FALSE);
+			lossless_check->setVisible(FALSE);
 		}
 		//</FS:Beq>
 		
@@ -162,21 +166,22 @@ BOOL LLFloaterImagePreview::postBuild()
 		{
 			gSavedSettings.setBOOL("TemporaryUpload", FALSE);
 		}
-		getChild<LLCheckBoxCtrl>("temp_check")->setVisible(enable_temp_uploads);
+		temp_check->setVisible(enable_temp_uploads);
 		// </FS:CR>
 
 		// <FS:Zi> detect and strip empty alpha layers from images on upload
 		getChild<LLUICtrl>("ok_btn")->setCommitCallback(boost::bind(&LLFloaterImagePreview::onBtnUpload, this));
 
-		getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[X_RES]", llformat("%d", mRawImagep->getWidth()));
-		getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[Y_RES]", llformat("%d", mRawImagep->getHeight()));
+		uploaded_size_text->setTextArg("[X_RES]", llformat("%d", mRawImagep->getWidth()));
+		uploaded_size_text->setTextArg("[Y_RES]", llformat("%d", mRawImagep->getHeight()));
+		uploaded_size_text->setVisible(TRUE);
 
 		mEmptyAlphaCheck = getChild<LLCheckBoxCtrl>("strip_alpha_check");
 
 		if (mRawImagep->getComponents() != 4)
 		{
 			getChild<LLUICtrl>("image_alpha_warning")->setVisible(false);
-			getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[ALPHA]", getString("no_alpha"));
+			uploaded_size_text->setTextArg("[ALPHA]", getString("no_alpha"));
 			return true;
 		}
 
@@ -205,7 +210,7 @@ BOOL LLFloaterImagePreview::postBuild()
 			mEmptyAlphaCheck->setValue(false);
 		}
 
-		getChild<LLUICtrl>("uploaded_size_text")->setTextArg("[ALPHA]", getString(mEmptyAlphaCheck->getValue() ? "no_alpha" : "with_alpha"));
+		uploaded_size_text->setTextArg("[ALPHA]", getString(mEmptyAlphaCheck->getValue() ? "no_alpha" : "with_alpha"));
 		// </FS:Zi>
 	}
 	else
@@ -216,6 +221,12 @@ BOOL LLFloaterImagePreview::postBuild()
 		getChildView("clothing_type_combo")->setEnabled(FALSE);
 		getChildView("ok_btn")->setEnabled(FALSE);
 
+		// <FS:PP> FIRE-32944 - Hide some items if texture is invalid
+		uploaded_size_text->setVisible(FALSE);
+		lossless_check->setVisible(FALSE);
+		temp_check->setVisible(FALSE);
+		// </FS:PP>
+
 		if(!mImageLoadError.empty())
 		{
 			getChild<LLUICtrl>("bad_image_text")->setValue(mImageLoadError.c_str());

From 508e73379b01876be6c936c02fa16dccb5e7aaf7 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Mon, 22 May 2023 18:48:33 +0200
Subject: [PATCH 8/9] FIRE-32960 Make Graphics Presets and Camera Presets
 pulldowns slightly taller

---
 .../skins/default/xui/en/panel_presets_camera_pulldown.xml  | 6 +++---
 .../newview/skins/default/xui/en/panel_presets_pulldown.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
index 44798aa39a..6d591a4eee 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
@@ -8,7 +8,7 @@
  border="false"
  chrome="true"
  follows="bottom"
- height="157"
+ height="257"
  layout="topleft"
  name="presets_camera_pulldown"
  width="225">
@@ -29,7 +29,7 @@
     follows="left|top"
     layout="topleft"
     column_padding="0"
-    height="100"
+    height="200"
     width="215"
     draw_heading="false"
     draw_stripes="false"
@@ -53,7 +53,7 @@
     layout="topleft"
     left="5"
     name="horiz_separator"
-    top_delta="105"
+    top_delta="205"
     width="215" />
   <button
     name="open_prefs_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
index 735ab59881..34f71cecec 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
@@ -8,7 +8,7 @@
  border="false"
  chrome="true"
  follows="bottom"
- height="157"
+ height="257"
  layout="topleft"
  name="presets_pulldown"
  width="225">
@@ -29,7 +29,7 @@
     follows="left|top"
     layout="topleft"
     column_padding="0"
-    height="100"
+    height="200"
     width="215"
     draw_heading="false"
     draw_stripes="false"
@@ -53,7 +53,7 @@
     layout="topleft"
     left="5"
     name="horiz_separator"
-    top_delta="105"
+    top_delta="205"
     width="215" />
   <button
     name="open_prefs_btn"

From 692a86e7cf65aaec2f81b3c01bc13b243f94cd3e Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Mon, 29 May 2023 12:38:29 +0100
Subject: [PATCH 9/9] make the package match more robust.

---
 .github/workflows/build_viewer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index 282225e71d..c5e2b1cf26 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -167,7 +167,7 @@ jobs:
             path_sep="\\"
           fi
           function find_most_recent_bundle() {
-            local pattern="$1.*$2.*"
+            local pattern="$1-.*$2-.*"
             local most_recent_file=$(ls -t "${{ github.workspace }}" | grep "$pattern" | head -1)
             if [ -z "$most_recent_file" ]; then
               echo ""