From 0c19be0529ab4eefd04c86c85ac81794e6481931 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 1 Mar 2024 20:58:51 +0000
Subject: [PATCH 01/38] Uncomment Linux for emojis

---
 indra/cmake/ICU4C.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
index 7b27665483..a9714696b4 100644
--- a/indra/cmake/ICU4C.cmake
+++ b/indra/cmake/ICU4C.cmake
@@ -12,8 +12,8 @@ if (WINDOWS)
   target_link_libraries( ll::icu4c INTERFACE  icuuc)
 elseif(DARWIN)
   target_link_libraries( ll::icu4c INTERFACE  icuuc)
-#elseif(LINUX)
-##  target_link_libraries( ll::icu4c INTERFACE  )
+elseif(LINUX)
+  target_link_libraries( ll::icu4c INTERFACE  icuuc)
 else()
   message(FATAL_ERROR "Invalid platform")
 endif()

From bb984beea40a7c8981338e7d33f774c6c1c24ac2 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sat, 2 Mar 2024 00:30:33 +0100
Subject: [PATCH 02/38] Updated Polish translation (emojis) Nottouching
 emoji_categories file due to 3p conflicts

---
 .../skins/default/xui/pl/floater_emoji_picker.xml        | 8 ++++++++
 .../skins/default/xui/pl/floater_fs_im_session.xml       | 9 +++++++++
 .../skins/default/xui/pl/floater_fs_nearby_chat.xml      | 9 +++++++++
 .../newview/skins/default/xui/pl/floater_im_session.xml  | 8 ++++++++
 .../skins/default/xui/pl/menu_fs_chat_options.xml        | 1 +
 indra/newview/skins/default/xui/pl/menu_login.xml        | 5 +++++
 indra/newview/skins/default/xui/pl/menu_viewer.xml       | 3 +++
 7 files changed, 43 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/pl/floater_emoji_picker.xml

diff --git a/indra/newview/skins/default/xui/pl/floater_emoji_picker.xml b/indra/newview/skins/default/xui/pl/floater_emoji_picker.xml
new file mode 100644
index 0000000000..01c16bcb81
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_emoji_picker.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="emojipicker" title="Wybierz emoji">
+	<floater.string name="title_for_recently_used" value="Ostatnio używane"/>
+	<floater.string name="title_for_frequently_used" value="Często używane"/>
+	<text name="Dummy">
+		Nie wybrano emoji
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_fs_im_session.xml b/indra/newview/skins/default/xui/pl/floater_fs_im_session.xml
index 70887395b0..61bf58ede2 100644
--- a/indra/newview/skins/default/xui/pl/floater_fs_im_session.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fs_im_session.xml
@@ -62,9 +62,18 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="Pokaż panel emoji" />
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="Pokaż/ukryj ostatnie emoji" />
+						</layout_panel>
 						<layout_panel name="input_button_layout_panel">
 							<button name="send_chat" label="Wyślij" tool_tip="Wyślij wiadomość IM" />
 						</layout_panel>
+						<layout_panel name="emoji_recent_layout_panel">
+							<text name="emoji_recent_empty_text">
+								Tutaj pojawią się ostatnio używane emoji
+							</text>
+						</layout_panel>
 					</layout_stack>
 				</layout_panel>
 			</layout_stack>
diff --git a/indra/newview/skins/default/xui/pl/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/pl/floater_fs_nearby_chat.xml
index aef77908db..7dc9a543fa 100644
--- a/indra/newview/skins/default/xui/pl/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fs_nearby_chat.xml
@@ -27,6 +27,10 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="Pokaż panel emoji" />
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="Pokaż/ukryj ostatnie emoji" />
+						</layout_panel>
 						<layout_panel name="input_button_layout_panel">
 							<spinner name="ChatChannel" tool_tip="Kanał, na jaki wiadomość na zostać wysłana. Włączone w Ustawienia -> Czat -> Firestorm -> Oferuj ręczny wybór kanału w pasku czatu."/>
 						</layout_panel>
@@ -40,6 +44,11 @@
 						</layout_panel>
 					</layout_stack>
 				</layout_panel>
+				<layout_panel name="emoji_recent_layout_panel">
+					<text name="emoji_recent_empty_text">
+						Tutaj pojawią się ostatnio używane emoji
+					</text>
+				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml
index b969afe44f..f298f0fc51 100644
--- a/indra/newview/skins/default/xui/pl/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml
@@ -21,11 +21,19 @@
 			</layout_panel>
 			<layout_panel name="chat_layout_panel">
 				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<button name="emoji_recent_panel_toggle_btn" tool_tip="Pokaż/ukryj ostatnie emoji" />
+					</layout_panel>
 					<layout_panel name="input_button_layout_panel">
 						<button name="minz_btn" tool_tip="Pokaż/ukryj panel wiadomości" />
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
+			<layout_panel name="emoji_recent_layout_panel">
+				<text name="emoji_recent_empty_text">
+					Tutaj pojawią się ostatnio używane emoji
+				</text>
+			</layout_panel>
 		</layout_stack>
 	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/menu_fs_chat_options.xml b/indra/newview/skins/default/xui/pl/menu_fs_chat_options.xml
index 71ae4f6189..2bb638b728 100644
--- a/indra/newview/skins/default/xui/pl/menu_fs_chat_options.xml
+++ b/indra/newview/skins/default/xui/pl/menu_fs_chat_options.xml
@@ -15,6 +15,7 @@
 	<menu_item_check label="Informuj o nowych wiadomościach" name="new_message_notification" />
 	<menu_item_check label="Pokaż pasek czatu" name="show_chat_bar" />
 	<menu_item_check label="Pokaż wybrany kanał" name="show_channel_selection" />
+	<menu_item_check label="Pokaż przycisk emoji" name="show_emoji_button" />
 	<menu_item_check label="Pokaż typ czatu / przycisk wysyłania" name="show_send_button" />
 	<menu_item_check label="Pokaż przycisk wysyłania w sesjach IM" name="show_im_send_button" />
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
index 38778fa432..2d880b499f 100644
--- a/indra/newview/skins/default/xui/pl/menu_login.xml
+++ b/indra/newview/skins/default/xui/pl/menu_login.xml
@@ -25,6 +25,11 @@
 	<menu label="Debugowanie" name="Debug">
 		<menu_item_call label="Pokaż ustawienia debugowania" name="Debug Settings"/>
 		<menu_item_call label="Narzędzie podglądu XUI" name="UI Preview Tool"/>
+		<menu label="Czcionki" name="Fonts">
+			<menu_item_call label="Pokaż test czcionek" name="Show Font Test" />
+			<menu_item_call label="Zrzuć czcionki" name="Dump Fonts" />
+			<menu_item_call label="Zrzuć tekstury czcionek" name="Dump Font Textures" />
+		</menu>
 		<menu label="Testy interfejsu" name="UI Tests"/>
 		<menu_item_call label="Ustaw rozmiar okna..." name="Set Window Size..."/>
 		<menu_item_call label="Pokaż warunki użytkowania" name="TOS"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 2473dc79cb..7a2d53d5e2 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -554,6 +554,8 @@
 			<menu_item_call label="Test przeglądarki mediów" name="Web Browser Test"/>
 			<menu_item_check label="Test restartu regionu" name="Region Restart Test"/>
 			<menu_item_call label="Przeglądarka treści internetowych" name="Web Content Browser"/>
+			<menu_item_call label="Zrzuć czcionki" name="Dump Fonts" />
+			<menu_item_call label="Zrzuć tekstury czcionek" name="Dump Font Textures" />
 			<menu_item_call label="Zrzut SelectMgr" name="Dump SelectMgr"/>
 			<menu_item_call label="Zrzut Szafy" name="Dump Inventory"/>
 			<menu_item_call label="Zrzut liczników" name="Dump Timers"/>
@@ -565,6 +567,7 @@
 			<menu_item_check label="Debuguj SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Debuguj kliknięcia" name="Debug Clicks"/>
 			<menu_item_check label="Debuguj widoki" name="Debug Views"/>
+			<menu_item_check label="Debuguj Unicode" name="Debug Unicode" />
 			<menu_item_check label="Debuguj chmurki dla podpowiedzi nazw" name="Debug Name Tooltips"/>
 			<menu_item_check label="Debuguj zdarzenia myszy" name="Debug Mouse Events"/>
 			<menu_item_check label="Debuguj klawisze" name="Debug Keys"/>

From 073c5e4da54e416fc807a6e4fd85dbf4e7770e1d Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 2 Mar 2024 02:57:21 +0100
Subject: [PATCH 03/38] Remove unused variable

---
 indra/newview/llviewermenu.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index d8661947fd..88d1870051 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -10935,7 +10935,6 @@ void handle_report_bug(const LLSD& param)
 	// <FS:Ansariel> Keep linking to out JIRA
     //std::string url = gSavedSettings.getString("ReportBugURL");
     //LLWeb::loadURLExternal(url);
-	LLUIString url(param.asString());
 	LLSD sysinfo = FSData::getSystemInfo();
 	LLStringUtil::format_map_t replace;
 	replace["[ENVIRONMENT]"] = LLURI::escape(sysinfo["Part1"].asString().substr(1) + sysinfo["Part2"].asString().substr(1));

From a3c5a72cfd40e6b099ed70dec0ade15b5fa577cc Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 2 Mar 2024 13:25:43 +0100
Subject: [PATCH 04/38] Add missing overrides

---
 indra/newview/fsgridhandler.h               |  2 +-
 indra/newview/fslslbridge.h                 | 18 +++++++++---------
 indra/newview/fsnearbychathub.h             |  2 --
 indra/newview/llavatarpropertiesprocessor.h |  4 ----
 indra/newview/llchicletbar.h                | 10 +++++-----
 indra/newview/lltoolcomp.h                  |  4 ++--
 indra/newview/lltoolface.h                  |  4 ++--
 indra/newview/qtoolalign.h                  | 12 ++++++------
 indra/newview/rlvinventory.h                |  2 +-
 indra/newview/utilitybar.h                  |  2 +-
 10 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/indra/newview/fsgridhandler.h b/indra/newview/fsgridhandler.h
index 1b1e8ad21f..8ac57866b2 100644
--- a/indra/newview/fsgridhandler.h
+++ b/indra/newview/fsgridhandler.h
@@ -128,7 +128,7 @@ public:
 	void initCmdLineGrids();
 	void resetGrids();
 	// grid list management
-	bool isReadyToLogin(){return mReadyToLogin;}
+	bool isReadyToLogin() const {return mReadyToLogin;}
 
 	// add a grid to the list of grids
 	void addGrid(const std::string& loginuri);
diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h
index 630c98a4be..a7efb1ec7e 100644
--- a/indra/newview/fslslbridge.h
+++ b/indra/newview/fslslbridge.h
@@ -77,19 +77,19 @@ public:
 	void processAttach(LLViewerObject* object, const LLViewerJointAttachment* attachment);
 	void processDetach(LLViewerObject* object, const LLViewerJointAttachment* attachment);
 
-	bool getBridgeCreating() { return mBridgeCreating; };
+	bool getBridgeCreating() const { return mBridgeCreating; };
 	void setBridgeCreating(bool status) { mBridgeCreating = status; };
 
 	void setBridge(LLViewerInventoryItem* item) { mpBridge = item; };
-	LLViewerInventoryItem* getBridge() { return mpBridge; };
+	LLViewerInventoryItem* getBridge() const { return mpBridge; };
 	bool canUseBridge();
 	bool isBridgeValid() const { return nullptr != mpBridge; }
 
 	void checkBridgeScriptName();
-	std::string currentFullName() { return mCurrentFullName; }
+	std::string currentFullName() const { return mCurrentFullName; }
 
-	LLUUID getBridgeFolder() { return mBridgeFolderID; }
-	LLUUID getAttachedID() { return mBridgeUUID; }
+	LLUUID getBridgeFolder() const { return mBridgeFolderID; }
+	LLUUID getAttachedID() const { return mBridgeUUID; }
 
 	bool canDetach(const LLUUID& item_id);
 
@@ -97,10 +97,10 @@ public:
 	void setTimerResult(TimerResult result);
 
 	// from LLVOInventoryListener
-	virtual void inventoryChanged(LLViewerObject* object,
-								LLInventoryObject::object_list_t* inventory,
-								S32 serial_num,
-								void* user_data);
+	void inventoryChanged(LLViewerObject* object,
+						  LLInventoryObject::object_list_t* inventory,
+						  S32 serial_num,
+						  void* user_data) override;
 
 private:
 	std::string				mCurrentURL;
diff --git a/indra/newview/fsnearbychathub.h b/indra/newview/fsnearbychathub.h
index 9c59cdd334..bd2c9fbfe2 100644
--- a/indra/newview/fsnearbychathub.h
+++ b/indra/newview/fsnearbychathub.h
@@ -39,8 +39,6 @@ class FSNearbyChat : public LLSingleton<FSNearbyChat>
 	LLSINGLETON(FSNearbyChat);
 	~FSNearbyChat();
 
-	void sendMsg();
-
 	static S32 sLastSpecialChatChannel;
 	FSNearbyChatControl* mDefaultChatBar;
 
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h
index 3538de13b9..10cde35f9c 100644
--- a/indra/newview/llavatarpropertiesprocessor.h
+++ b/indra/newview/llavatarpropertiesprocessor.h
@@ -216,10 +216,6 @@ public:
 	void sendAvatarGroupsRequest(const LLUUID& avatar_id);
 	void sendAvatarTexturesRequest(const LLUUID& avatar_id);
 	void sendAvatarClassifiedsRequest(const LLUUID& avatar_id);
-	// <FS:Beq> enable legacy profile access for OpenSim to work with new profile
-	void sendGenericRequestLegacy(const LLUUID& avatar_id, EAvatarProcessorType type, const std::string method);
-	void sendAvatarPropertiesRequestLegacy(const LLUUID& avatar_id);
-	// </FS:Beq>
 
 	// Duplicate pick info requests are not suppressed.
 	void sendPickInfoRequest(const LLUUID& creator_id, const LLUUID& pick_id);
diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h
index 710491f36a..44dbf76697 100644
--- a/indra/newview/llchicletbar.h
+++ b/indra/newview/llchicletbar.h
@@ -49,11 +49,11 @@ public:
 	~LLChicletBar();
 
 	// LLIMSessionObserver observe triggers
-	/*virtual*/ void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg);
-	/*virtual*/ void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) {}
-	/*virtual*/ void sessionVoiceOrIMStarted(const LLUUID& session_id) {};
-	/*virtual*/ void sessionRemoved(const LLUUID& session_id);
-	/*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id);
+	/*virtual*/ void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg) override;
+	/*virtual*/ void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) override {}
+	/*virtual*/ void sessionVoiceOrIMStarted(const LLUUID& session_id) override {};
+	/*virtual*/ void sessionRemoved(const LLUUID& session_id) override;
+	/*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id) override;
 
 	S32 getTotalUnreadIMCount();
 
diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h
index ec50d32a7a..7b462c1525 100644
--- a/indra/newview/lltoolcomp.h
+++ b/indra/newview/lltoolcomp.h
@@ -168,8 +168,8 @@ public:
 	static void pickCallback(const LLPickInfo& pick_info);
 
 	// <FS:Zi> Add middle mouse control for switching uniform scaling on the fly
-	virtual BOOL		handleMiddleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMiddleMouseUp(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleMiddleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMiddleMouseUp(S32 x, S32 y, MASK mask) override;
 	// </FS:Zi>
 };
 
diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h
index 654c9baec8..d5b6da3d95 100644
--- a/indra/newview/lltoolface.h
+++ b/indra/newview/lltoolface.h
@@ -48,8 +48,8 @@ public:
 	static void pickCallback(const LLPickInfo& pick_info);
 
 	// <FS:Zi> Add control to drag texture faces around
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual void	stopGrabbing();
+	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) override;
+	void	stopGrabbing();
 
 	static BOOL mTextureGrabbed;
 	static LLViewerObject* mTextureObject;
diff --git a/indra/newview/qtoolalign.h b/indra/newview/qtoolalign.h
index ca3da4fa56..6fae2a7e82 100644
--- a/indra/newview/qtoolalign.h
+++ b/indra/newview/qtoolalign.h
@@ -19,12 +19,12 @@ class QToolAlign : public LLTool, public LLSingleton<QToolAlign>
 	virtual ~QToolAlign();
 
 public:
-	virtual void	handleSelect();
-	virtual void	handleDeselect();
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual void	render();
-	virtual BOOL	canAffectSelection();
+	virtual void	handleSelect() override;
+	virtual void	handleDeselect() override;
+	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) override;
+	virtual void	render() override;
+	BOOL	canAffectSelection();
 
 	static void pickCallback(const LLPickInfo& pick_info);
 
diff --git a/indra/newview/rlvinventory.h b/indra/newview/rlvinventory.h
index 482a308392..cf57a84bb1 100644
--- a/indra/newview/rlvinventory.h
+++ b/indra/newview/rlvinventory.h
@@ -41,7 +41,7 @@ class RlvInventory : public LLSingleton<RlvInventory>, public LLInventoryObserve
 
 public:
 	// LLInventoryObserver override
-	/*virtual*/ void changed(U32 mask);
+	/*virtual*/ void changed(U32 mask) override;
 
 	/*
 	 * #RLV Shared inventory
diff --git a/indra/newview/utilitybar.h b/indra/newview/utilitybar.h
index f1bab26fe8..d58a24082c 100644
--- a/indra/newview/utilitybar.h
+++ b/indra/newview/utilitybar.h
@@ -39,7 +39,7 @@ class UtilityBar
 
 	public:
 		void init();
-		virtual BOOL tick();
+		virtual BOOL tick() override;
 		void setAOInterfaceButtonExpanded(bool expanded);
 		void setVolumeControlsButtonExpanded(bool expanded);
 

From 7f038e68e7e99d7e830f413378d4b23351af113c Mon Sep 17 00:00:00 2001
From: Pork Chop <mygoditsfullofstars@phoenixviewer.com>
Date: Sun, 3 Mar 2024 00:10:32 +1100
Subject: [PATCH 05/38] Linux: Fix build after recent merge

---
 autobuild.xml                                 | 112 ++++++++++++++----
 indra/cmake/FreeType.cmake                    |   5 -
 indra/cmake/ICU4C.cmake                       |   5 +
 .../linux_crash_logger/linux_crash_logger.cpp |  48 +++++++-
 indra/newview/viewer_manifest.py              |   2 +-
 indra/newview/vjlocalmesh.cpp                 |   5 +-
 6 files changed, 144 insertions(+), 33 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 74e25f19d5..af517c7672 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -112,9 +112,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>80d157facdba399b3a59c400e29cb625</string>
+              <string>1e74b8cc3694150a7751aeb12f3456d414412c0e</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/glib-2.64.6.230870115-linux64-230870115.tar.bz2</string>
+              <string>https://3p.firestormviewer.org/glib-2.64.6.240620740-linux64-240620740.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -544,9 +546,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8d96a9d1a9a208b1f48ac677edb7ca4d</string>
+              <string>5d1952e270a873d4587f7b943ed6e3f87d5023da</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/boost-1.72-linux64-222121224.tar.bz2</string>
+              <string>https://3p.firestormviewer.org/boost-1.81-linux64-240621158.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -648,9 +652,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8b79711b4fa914c16f1284939d55dcc1</string>
+              <string>83f9c9aff5a7b96711c04bd33cb453c108dee3a5</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/colladadom-2.3.230940029-linux64-230940029.tar.bz2</string>
+              <string>https://3p.firestormviewer.org/colladadom-2.3.240621210-linux64-240621210.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -762,9 +768,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8e92fc9ec2b3be6d2a5387fc283f954f</string>
+              <string>7bb9bbadb44dd7490c3e6804395df01ab800bc18</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/curl-8.3.0.232750741-linux64-232750741.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-curl/releases/download/v7.54.1-513145c/curl-7.54.1-513145c-linux64-513145c.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -913,6 +921,20 @@
             <key>name</key>
             <string>darwin64</string>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>c036cc042523fb6a3dafb7134f83e52c566c0765</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://3p.firestormviewer.org/emoji_shortcodes-6.1.0.240620448-linux64-240620448.tar.zst</string>
+            </map>
+            <key>name</key>
+            <string>linux64</string>
+          </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
@@ -1110,11 +1132,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4a999279562e8f3e4ba02d3e78a844ddf6fe18f1</string>
+              <string>bf2d2e4350caaea2b2fb6116d05548c80f402f81</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.557becd/freetype-2.12.1.557becd-linux64-557becd.tar.zst</string>
+              <string>https://3p.firestormviewer.org/freetype-2.12.1.240620850-linux64-240620850.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -1379,6 +1401,20 @@
             <key>name</key>
             <string>darwin64</string>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>f5e5be3af96f1eb0842219a94765c04aa9c561c5</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://3p.firestormviewer.org/icu4c-4.8.1-linux64-240621048.tar.zst</string>
+            </map>
+            <key>name</key>
+            <string>linux64</string>
+          </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
@@ -1750,9 +1786,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>134089ec8c1eead9436b69c326790fc0</string>
+              <string>e646a9da0ddfe1dfbffc6600d7d35f78ac48c75e</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/libpng-1.6.38.222890126-linux64-222890126.tar.bz2</string>
+              <string>https://3p.firestormviewer.org/libpng-1.6.38-240620624-linux64-240620624.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -1838,9 +1876,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d72c6d8db827ce3d83c5703f519a2ac9</string>
+              <string>fda5d399c21c3ad29a78f29599523ca4ecf76bd2</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/libxml2-2.10.3.230940019-linux64-230940019.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-libxml2/releases/download/v2.9.4-2db4418/libxml2-2.9.4.2db4418-linux64-2db4418.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -2279,9 +2319,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ee4e3a02ad4669a4d84e9c32e509530e</string>
+              <string>d4f35ebcea53ab6e9f2e6cbc0d680b10d10b9c53</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/minizip_ng-3.0.2.222121607-linux64-222121607.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-minizip-ng/releases/download/v3.0.2.3e9876e/minizip_ng-3.0.2.3e9876e-linux64-3e9876e.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -2395,9 +2437,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>57670eaa6333d9127b8ba88f120e56dd</string>
+              <string>5798b5f6c8579ad44f211a873c072ee8d3fd8c93</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/nghttp2-1.56.0.232750738-linux64-232750738.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-nghttp2/releases/download/v1.40.0.b1526c6/nghttp2-1.40.0.b1526c6-linux64-b1526c6.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -2696,9 +2740,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>a3b2dbffa28a2b2a63c5d3ce2c12bc85</string>
+              <string>5f6953db991ef6badb0525ecc98daf28d368e9e7</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/openssl-1.1.1w.232750656-linux64-232750656.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-openssl/releases/download/v1.1.1q.de53f55/openssl-1.1.1q.de53f55-linux64-de53f55.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -2754,9 +2800,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>742a145c1518b9dc195ae0862828e6ae</string>
+              <string>3a722c508a9278a49317e3f749f3256768f1c50b</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/pcre-8.35.202021522-linux64-202021522.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-pcre/releases/download/v8.35-3c0eb51/pcre-8.35.3c0eb51-linux64-3c0eb51.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -3103,6 +3151,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>name</key>
             <string>darwin64</string>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>0f648faa1aee4e233330b87ce7a31727a28dffc3</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://3p.firestormviewer.org/viewer_fonts-1.240620521-linux64-240620521.tar.zst</string>
+            </map>
+            <key>name</key>
+            <string>linux64</string>
+          </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
@@ -3438,9 +3500,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>5ee7cda65cede06190c811e59b3880b0</string>
+              <string>fba88375e12454ae19f4528e11ffc7ddf7d879ec</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/zlib_ng-2.0.5.222121000-linux64-222121000.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-linux64-32fd361.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index 816174c4ba..3b9f41b3f9 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -4,12 +4,7 @@ include(Prebuilt)
 include_guard()
 add_library( ll::freetype INTERFACE IMPORTED )
 
-if (LINUX)
-  find_package(Freetype REQUIRED) # <FS:PC> linux fontconfig and freetype should come from the user's system Linux links this via llwindow/CMakeLists
-  target_link_libraries( ll::freetype INTERFACE Freetype::Freetype )
-else ()
 use_system_binary(freetype)
 use_prebuilt_binary(freetype)
 target_include_directories( ll::freetype SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/freetype2/)
 target_link_libraries( ll::freetype INTERFACE freetype )
-endif()
diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
index a9714696b4..806ad28e99 100644
--- a/indra/cmake/ICU4C.cmake
+++ b/indra/cmake/ICU4C.cmake
@@ -13,6 +13,11 @@ if (WINDOWS)
 elseif(DARWIN)
   target_link_libraries( ll::icu4c INTERFACE  icuuc)
 elseif(LINUX)
+  #<FS:PC>
+  #The icu4c 3p puts the libraries in "lib" rather than the normal "release/lib".
+  #Add this to the link search path (otherwise link to the library fails)
+  target_link_directories( ll::icu4c INTERFACE ${LIBS_PREBUILT_DIR}/lib)
+
   target_link_libraries( ll::icu4c INTERFACE  icuuc)
 else()
   message(FATAL_ERROR "Invalid platform")
diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp
index 5d55e551a4..f14c170939 100644
--- a/indra/linux_crash_logger/linux_crash_logger.cpp
+++ b/indra/linux_crash_logger/linux_crash_logger.cpp
@@ -68,6 +68,11 @@ int main(int argc, char **argv)
     curl_global_init(CURL_GLOBAL_ALL);
 
     auto curl = curl_easy_init();
+
+//Not compatible with LL's crusty old curl - support for the curl_mime functions
+//was introduced in curl 7.57.0, LL is still using 7.54 :(
+
+/*
     if( curl)
     {
         auto form = curl_mime_init(curl);
@@ -95,6 +100,47 @@ int main(int argc, char **argv)
         curl_easy_cleanup(curl);
 
         curl_mime_free(form);
-    }
+    }*/
+
+if (auto curl_handle = curl_easy_init()) {
+    struct curl_httppost* formpost = NULL;
+    struct curl_httppost* lastptr = NULL;
+
+    // Add the file part
+    curl_formadd(&formpost, &lastptr,
+                 CURLFORM_COPYNAME, "upload_file_minidump",
+                 CURLFORM_FILE, dmpFile.c_str(),
+                 CURLFORM_END);
+
+    // Add the 'product' part
+    curl_formadd(&formpost, &lastptr,
+                 CURLFORM_COPYNAME, "product",
+                 CURLFORM_COPYCONTENTS, "Firestorm-Releasex64",
+                 CURLFORM_END);
+
+    // Add the 'version' part
+    curl_formadd(&formpost, &lastptr,
+                 CURLFORM_COPYNAME, "version",
+                 CURLFORM_COPYCONTENTS, version.c_str(),
+                 CURLFORM_END);
+
+    // Set the URL
+    curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str());
+
+    // Set the form post data
+    curl_easy_setopt(curl_handle, CURLOPT_HTTPPOST, formpost);
+
+    // Perform the request
+    auto res = curl_easy_perform(curl_handle);
+
+    // Cleanup
+    curl_easy_cleanup(curl_handle);
+    curl_formfree(formpost);
+
+    // Check for errors
+    if (res != CURLE_OK)
+        std::cerr << "curl_easy_perform() failed: " << curl_easy_strerror(res) << std::endl;
+}
+
     return 0;
 }
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index dec8cd1fde..5135e3bf3a 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -2263,7 +2263,7 @@ class Linux_i686_Manifest(LinuxManifest):
             # self.path("libfontconfig.so.*.*")    # <FS:PC> fontconfig and freetype should be taken from the user's system
 
             # Include libfreetype.so. but have it work as libfontconfig does.
-            # self.path("libfreetype.so.*.*")      # <FS:PC> fontconfig and freetype should be taken from the user's system
+            self.path("libfreetype.so.*.*")
 
             try:
                 self.path("libtcmalloc.so*") #formerly called google perf tools
diff --git a/indra/newview/vjlocalmesh.cpp b/indra/newview/vjlocalmesh.cpp
index c0217bb9cd..e8871f58c7 100644
--- a/indra/newview/vjlocalmesh.cpp
+++ b/indra/newview/vjlocalmesh.cpp
@@ -468,8 +468,9 @@ LLLocalMeshFile::LLLocalMeshFile(const std::string& filename, bool try_lods)
 	mFilenames[LOCAL_LOD_HIGH] = filename;
 
 	// check if we have a valid extension, can't switch with string can we?
-	if( std::string exten_str = boost::filesystem::extension(filename);
-		boost::iequals(exten_str, ".dae") )
+	auto path = boost::filesystem::path(filename);
+	if (std::string exten_str = path.extension().string();
+	boost::iequals(exten_str, ".dae") )
 	{
 		mExtension = LLLocalMeshFileExtension::EXTEN_DAE;
 		pushLog("LLLocalMeshFile", "Extension found: COLLADA");

From d571aecd014ef0c1b33298a94a1dbad334a0d097 Mon Sep 17 00:00:00 2001
From: Pork Chop <mygoditsfullofstars@phoenixviewer.com>
Date: Sun, 3 Mar 2024 00:12:16 +1100
Subject: [PATCH 06/38] This reverts commit
 3be882c1c6ec035b40f01d3883a13f3891fb8fc9 - Not compatible with LL's version
 of curl (too old).

---
 indra/llcorehttp/_httpoprequest.cpp | 7 +------
 indra/llcorehttp/httpresponse.h     | 7 -------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
index e711451b8a..50317a8f0b 100644
--- a/indra/llcorehttp/_httpoprequest.cpp
+++ b/indra/llcorehttp/_httpoprequest.cpp
@@ -276,15 +276,10 @@ void HttpOpRequest::visitNotifier(HttpRequest * request)
 		
 		HttpResponse::TransferStats::ptr_t stats = HttpResponse::TransferStats::ptr_t(new HttpResponse::TransferStats);
 
-#if LL_LINUX
-                curl_easy_getinfo(mCurlHandle, CURLINFO_SIZE_DOWNLOAD_T, &stats->mSizeDownload);
-                curl_easy_getinfo(mCurlHandle, CURLINFO_TOTAL_TIME, &stats->mTotalTime);
-                curl_easy_getinfo(mCurlHandle, CURLINFO_SPEED_DOWNLOAD_T, &stats->mSpeedDownload);
-#else
 		curl_easy_getinfo(mCurlHandle, CURLINFO_SIZE_DOWNLOAD, &stats->mSizeDownload);
 		curl_easy_getinfo(mCurlHandle, CURLINFO_TOTAL_TIME, &stats->mTotalTime);
 		curl_easy_getinfo(mCurlHandle, CURLINFO_SPEED_DOWNLOAD, &stats->mSpeedDownload);
-#endif
+
 		response->setTransferStats(stats);
 
 		mUserHandler->onCompleted(this->getHandle(), response);
diff --git a/indra/llcorehttp/httpresponse.h b/indra/llcorehttp/httpresponse.h
index 1403e1c64f..b834085e5c 100644
--- a/indra/llcorehttp/httpresponse.h
+++ b/indra/llcorehttp/httpresponse.h
@@ -75,16 +75,9 @@ public:
 		typedef boost::shared_ptr<TransferStats> ptr_t;
 
 		TransferStats() : mSizeDownload(0.0), mTotalTime(0.0), mSpeedDownload(0.0) {}
-
-#if LL_LINUX
-		curl_off_t mSizeDownload;
-		curl_off_t mSpeedDownload;
-		F64 mTotalTime;
-#else
 		F64 mSizeDownload;
 		F64 mTotalTime;
 		F64 mSpeedDownload;
-#endif
 	};
 
 

From 620558b23060c17667adade0f21974f0042e4850 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 2 Mar 2024 20:17:01 +0000
Subject: [PATCH 07/38] Add one more missing override for now.

---
 indra/newview/llvoicevivox.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index cbb24e50ae..3f1d4bd755 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -209,7 +209,7 @@ public:
 	virtual void removeObserver(LLVoiceClientParticipantObserver* observer) override;
 
 	// <FS:Ansariel> Add callback for user volume change
-	boost::signals2::connection setUserVolumeUpdateCallback(const user_voice_volume_change_callback_t::slot_type& cb)
+	boost::signals2::connection setUserVolumeUpdateCallback(const user_voice_volume_change_callback_t::slot_type& cb) override;
 	{
 		return mUserVolumeUpdateSignal.connect(cb);
 	}

From 088b58c633007c5b6ca16e04b8a1d44d643792c1 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 2 Mar 2024 22:42:31 +0100
Subject: [PATCH 08/38] Fix the build

---
 indra/newview/llvoicevivox.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 3f1d4bd755..2eacc94943 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -209,7 +209,7 @@ public:
 	virtual void removeObserver(LLVoiceClientParticipantObserver* observer) override;
 
 	// <FS:Ansariel> Add callback for user volume change
-	boost::signals2::connection setUserVolumeUpdateCallback(const user_voice_volume_change_callback_t::slot_type& cb) override;
+	boost::signals2::connection setUserVolumeUpdateCallback(const user_voice_volume_change_callback_t::slot_type& cb) override
 	{
 		return mUserVolumeUpdateSignal.connect(cb);
 	}

From 4607e727bf6d8fb8fe75d3a2235e398fdd17dad0 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 3 Mar 2024 00:18:28 +0000
Subject: [PATCH 09/38] remove the underlying emoji icon to prevent ugly
 overlay

---
 indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
index 7a273af34c..4dfff97bd0 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
@@ -285,7 +285,6 @@
                image_hover_unselected="Toolbar_Middle_Over"
                image_selected="Toolbar_Middle_Selected"
                image_unselected="Toolbar_Middle_Off"
-               image_overlay="Emoji_Picker_Icon"
                right="-11"
                name="emoji_picker_toggle_btn"
                tool_tip="Show emoji panel"

From 09b52ab8234eb33306ab4c9dbac6a97e4114314a Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 3 Mar 2024 01:24:09 +0100
Subject: [PATCH 10/38] Fix the emoji buttons the intended way as seen on the
 LL viewer

---
 indra/newview/fsfloaterim.cpp                                 | 1 -
 indra/newview/fsfloaternearbychat.cpp                         | 1 -
 indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp
index 897289cc91..c3b25270d2 100644
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@@ -973,7 +973,6 @@ BOOL FSFloaterIM::postBuild()
 	mEmojiRecentIconsCtrl->setVisible(false);
 
 	mEmojiPickerToggleBtn = getChild<LLButton>("emoji_picker_toggle_btn");
-	mEmojiPickerToggleBtn->setLabel(LLUIString(LLWString(1, 128512)));
 	mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); });
 
 	mRecentEmojisUpdatedCallbackConnection = LLFloaterEmojiPicker::setRecentEmojisUpdatedCallback([this](const std::list<llwchar>& recent_emojis_list) { initEmojiRecentPanel(); });
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index db9c677fdf..b2922e5f57 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -162,7 +162,6 @@ BOOL FSFloaterNearbyChat::postBuild()
 	mEmojiRecentIconsCtrl->setVisible(false);
 
 	mEmojiPickerToggleBtn = getChild<LLButton>("emoji_picker_toggle_btn");
-	mEmojiPickerToggleBtn->setLabel(LLUIString(LLWString(1, 128512)));
 	mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); });
 
 	mRecentEmojisUpdatedCallbackConnection = LLFloaterEmojiPicker::setRecentEmojisUpdatedCallback([this](const std::list<llwchar>& recent_emojis_list) { initEmojiRecentPanel(); });
diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
index 4dfff97bd0..7a273af34c 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
@@ -285,6 +285,7 @@
                image_hover_unselected="Toolbar_Middle_Over"
                image_selected="Toolbar_Middle_Selected"
                image_unselected="Toolbar_Middle_Off"
+               image_overlay="Emoji_Picker_Icon"
                right="-11"
                name="emoji_picker_toggle_btn"
                tool_tip="Show emoji panel"

From d5c78133833bc928c249da958f3bc46143b7fa4e Mon Sep 17 00:00:00 2001
From: Pork Chop <mygoditsfullofstars@phoenixviewer.com>
Date: Sun, 3 Mar 2024 17:04:56 +1100
Subject: [PATCH 11/38] Linux: Freetype 3p lib - fix packaging fail...

---
 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 5135e3bf3a..824754c410 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -2085,6 +2085,7 @@ class LinuxManifest(ViewerManifest):
             self.path("ca-bundle.crt")
 
         with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"):
+            self.path("libfreetype.so*")
             self.path("libapr-1.so*")
             self.path("libaprutil-1.so*")
             #self.path("libboost_context-mt.so*")

From b3ee620146d51ff85eb97386d77c81a60195ea03 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 3 Mar 2024 11:49:37 +0100
Subject: [PATCH 12/38] Add emoji panels in Vintage skin

---
 .../vintage/xui/en/floater_fs_im_session.xml  | 67 ++++++++++++++++++-
 .../vintage/xui/en/floater_fs_nearby_chat.xml | 60 +++++++++++++++++
 2 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/vintage/xui/en/floater_fs_im_session.xml b/indra/newview/skins/vintage/xui/en/floater_fs_im_session.xml
index d0a6087a2f..e056fff42b 100644
--- a/indra/newview/skins/vintage/xui/en/floater_fs_im_session.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_fs_im_session.xml
@@ -449,7 +449,7 @@
        top="0"
        left_delta="5"
        name="FSSupportGroupChatPrefix_toggle"
-       tool_tip="Adds your current viewer version and skin information to the front of messages sent by you to this group which will assist support staff in correctly diagnosing your issues and improve accuracy in answering your questions"
+       tool_tip="Adds current viewer version, viewer skin, operating system and RLVa status to the front of messages sent by you to this group which will assist support staff in correctly diagnosing your issues and improve accuracy in answering your questions"
        width="110" />
   </layout_panel>
     <layout_panel
@@ -470,7 +470,7 @@
        top="0"
        left_delta="5"
        name="FSSupportGroupChatPrefixTesting_toggle"
-       tool_tip="Adds your current viewer build and skin information to the front of messages sent by you to this group which will assist support staff in correctly diagnosing your issues and improve accuracy in answering your questions. (This is seperate from the support groups)"
+       tool_tip="Adds current viewer version, viewer skin, operating system and RLVa status to the front of messages sent by you to this group which will assist support staff in correctly diagnosing your issues and improve accuracy in answering your questions. (This is seperate from the support groups)"
        width="110" />
   </layout_panel>
   <!-- END: FS Prefix -->
@@ -603,6 +603,44 @@
               right="-2"
               wrap="true" />
             </layout_panel>
+            <layout_panel
+              visibility_control="FSShowEmojiButton"
+              auto_resize="false"
+              user_resize="false"
+              name="emoji_button_layout_panel"
+              width="35"
+              top="0"
+              bottom="-1">
+              <button
+               follows="right|bottom"
+               bottom="23"
+               height="22"
+               use_font_color="true"
+               font="EmojiLarge"
+               image_hover_unselected="Toolbar_Middle_Over"
+               image_selected="Toolbar_Middle_Selected"
+               image_unselected="Toolbar_Middle_Off"
+               image_overlay="Emoji_Picker_Icon"
+               right="-11"
+               name="emoji_picker_toggle_btn"
+               tool_tip="Show emoji panel"
+               width="24"/>
+              <button
+               follows="right|bottom"
+               bottom="23"
+               height="22"
+               use_font_color="true"
+               font="EmojiLarge"
+               image_hover_unselected="Toolbar_Middle_Over"
+               image_selected="Toolbar_Middle_Selected"
+               image_unselected="Toolbar_Middle_Off"
+               image_overlay="Arrow_Down"
+               right="-1"
+               name="emoji_recent_panel_toggle_btn"
+               tool_tip="Shows/hides recent emojis"
+               left_pad="0"
+               width="10"/>
+            </layout_panel>
             <layout_panel
               visibility_control="FSShowIMSendButton"
               auto_resize="false"
@@ -624,6 +662,31 @@
             </layout_panel>
           </layout_stack>
         </layout_panel>
+        <layout_panel
+         name="emoji_recent_layout_panel"
+         height="28"
+         auto_resize="false">
+            <text
+             name="emoji_recent_empty_text"
+             follows="top|left|right"
+             layout="topleft"
+             h_pad="20"
+             v_pad="5"
+             top="0"
+             left="5"
+             right="-1"
+             height="25"
+            >Recently used emojis will appear here</text>
+            <emoji_complete
+             name="emoji_recent_icons_ctrl"
+             follows="top|left|right"
+             layout="topleft"
+             max_visible="20"
+             top="0"
+             left="5"
+             right="-1"
+             height="25"/>
+        </layout_panel>
       </layout_stack>
     </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml
index 42e10cf146..d756c87547 100644
--- a/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml
@@ -252,6 +252,41 @@
                right="-4"
                wrap="true" />
             </layout_panel>
+            <layout_panel
+              visibility_control="FSShowEmojiButton"
+              auto_resize="false"
+              user_resize="false"
+              name="emoji_button_layout_panel"
+              width="35">
+              <button
+               follows="right|bottom"
+               bottom="-1"
+               height="22"
+               font="EmojiLarge"
+               image_hover_unselected="Toolbar_Middle_Over"
+               image_selected="Toolbar_Middle_Selected"
+               image_unselected="Toolbar_Middle_Off"
+               image_overlay="Emoji_Picker_Icon"
+               right="-11"
+               name="emoji_picker_toggle_btn"
+               tool_tip="Show emoji panel"
+               width="24"/>
+              <button
+               follows="right|bottom"
+               bottom="-1"
+               height="22"
+               use_font_color="true"
+               font="EmojiLarge"
+               image_hover_unselected="Toolbar_Middle_Over"
+               image_selected="Toolbar_Middle_Selected"
+               image_unselected="Toolbar_Middle_Off"
+               image_overlay="Arrow_Down"
+               right="-1"
+               name="emoji_recent_panel_toggle_btn"
+               tool_tip="Shows/hides recent emojis"
+               left_pad="0"
+               width="10"/>
+            </layout_panel>
             <layout_panel
               visibility_control="FSShowChatChannel"
               auto_resize="false"
@@ -346,6 +381,31 @@
             </layout_panel>
           </layout_stack>
         </layout_panel>
+        <layout_panel
+         name="emoji_recent_layout_panel"
+         height="28"
+         auto_resize="false">
+            <text
+             name="emoji_recent_empty_text"
+             follows="top|left|right"
+             layout="topleft"
+             h_pad="20"
+             v_pad="5"
+             top="0"
+             left="5"
+             right="-1"
+             height="25"
+             >Recently used emojis will appear here</text>
+            <emoji_complete
+             name="emoji_recent_icons_ctrl"
+             follows="top|left|right"
+             layout="topleft"
+             max_visible="20"
+             top="0"
+             left="5"
+             right="-1"
+             height="25"/>
+        </layout_panel>
       </layout_stack>
     </layout_panel>
   </layout_stack>

From 8928bc374b2a9e52a425c86df875f6af85a47a70 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 3 Mar 2024 12:21:57 +0100
Subject: [PATCH 13/38] Found the context menu for the chat input bar that went
 missing

---
 indra/newview/skins/default/xui/en/widgets/chat_editor.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
index 0c9a031926..362175ce50 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
@@ -2,6 +2,7 @@
 <chat_editor
   name="chat_editor"
   enable_tab_remove="false"
+  show_context_menu="true"
   show_emoji_helper="true"
   use_color="true"
   />

From 75dd734cebcdb709c31d115d6e03f1e4da0d1143 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 3 Mar 2024 17:02:36 +0100
Subject: [PATCH 14/38] Add option in preferences to show/hide emoji button in
 chat bar for IM sessions and Nearby Chat Menu option in chat window itself
 may not be too easy to find

---
 .../skins/default/xui/en/panel_preferences_chat.xml       | 8 ++++++++
 .../skins/default/xui/pl/panel_preferences_chat.xml       | 1 +
 2 files changed, 9 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index b15ef898b4..87029ce152 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -913,6 +913,14 @@
 		 control_name="FSShowIMSendButton"
 		 name="FSShowIMSendButton"
 		 label="Show send chat button in chat bar for IM sessions"/>
+		<check_box
+		 layout="topleft"
+		 top_pad="1"
+		 height="16"
+		 width="400"
+		 control_name="FSShowEmojiButton"
+		 name="FSShowEmojiButton"
+		 label="Show emoji button in chat bar for IM sessions and Nearby Chat"/>
 		<check_box
 		 layout="topleft"
 		 top_pad="1"
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index b7c72f4fbb..aa4a1838da 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -142,6 +142,7 @@
 			<check_box name="AllowMUpose" label="&quot;:&quot; synonimem dla &quot;/me&quot;"/>
 			<check_box name="AutoCloseOOC" label="Domykaj ((nawiasy)) dla czatu OOC"/>
 			<check_box name="FSShowIMSendButton" label="Pokaż przycisk wysyłania wiadomości w pasku czatu dla sesji IM"/>
+			<check_box name="FSShowEmojiButton" label="Pokaż przycisk emoji w pasku czatu dla sesji IM i czatu w pobliżu"/>
 			<check_box name="FSNearbyChatbar" label="Dodaj pasek czatu do okna czatu w pobliżu"/>
 			<check_box name="FSShowChatChannel" label="Oferuj ręczny wybór kanału w pasku czatu"/>
 			<check_box name="FSShowChatType" label="Pokaż typ czatu i przycisk wysyłania"/>

From 746bc58709ab64bf8f5275798a6fad738f88c257 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 3 Mar 2024 17:29:14 +0100
Subject: [PATCH 15/38] Update German translation

---
 indra/newview/skins/default/xui/de/panel_preferences_chat.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index e22f3a2c3e..84ffc32a7f 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -148,6 +148,7 @@
 			<check_box name="AllowMUpose" label="„:“ als Synonym für &quot;/me&quot; verwenden"/>
 			<check_box name="AutoCloseOOC" label="((OOC))-Klammern automatisch schließen"/>
 			<check_box name="FSShowIMSendButton" label="Senden-Button in Eingabezeile für IM-Sitzungen anzeigen"/>
+			<check_box name="FSShowEmojiButton" label="Emoji-Button in Eingabezeile für Lokaler Chat IM-Sitzungen anzeigen"/>
 			<check_box name="FSNearbyChatbar" label="Eingabezeile zum Fenster Lokaler Chat hinzufügen"/>
 			<check_box name="FSShowChatChannel" label="Kanalauswahl in Eingabezeile anzeigen"/>
 			<check_box name="FSShowChatType" label="Chat-Typ/Senden-Button anzeigen"/>

From 5a0b671cc10cc981016d914d8601efe6cd069c99 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Mon, 4 Mar 2024 00:14:21 +0100
Subject: [PATCH 16/38] FIRE-33735: Option to suppress emoji chooser window
 from automatically popping up while typing in chat bars

---
 indra/llui/llemojihelper.cpp                       |  8 ++++++++
 indra/newview/app_settings/settings.xml            | 11 +++++++++++
 .../default/xui/de/panel_preferences_chat.xml      |  2 +-
 .../default/xui/en/panel_preferences_chat.xml      | 14 +++++++++++---
 .../default/xui/pl/panel_preferences_chat.xml      |  3 ++-
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index 89e6ddf987..d60b2da8ce 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -57,6 +57,14 @@ bool LLEmojiHelper::isActive(const LLUICtrl* ctrl_p) const
 // static
 bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S32* pShortCodePos)
 {
+	// <FS:PP> FIRE-33735: Option to suppress emoji chooser window from automatically popping up while typing in chat bars
+	static LLCachedControl<bool> FSSuppressEmojiWindowPopupWhileTyping(*LLUI::getInstance()->mSettingGroups["config"], "FSSuppressEmojiWindowPopupWhileTyping");
+	if (FSSuppressEmojiWindowPopupWhileTyping)
+	{
+		return false;
+	}
+	// </FS:PP>
+
 	// If the cursor is currently on a colon start the check one character further back
 	S32 shortCodePos = (cursorPos == 0 || L':' != wtext[cursorPos - 1]) ? cursorPos : cursorPos - 1;
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 24a5253e60..a66b4cf24a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -26748,5 +26748,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSSuppressEmojiWindowPopupWhileTyping</key>
+    <map>
+      <key>Comment</key>
+      <string>Suppress emoji chooser window from automatically popping up while typing in chat bars.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
 </map>
 </llsd>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 84ffc32a7f..ab9ab1fe22 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -147,8 +147,8 @@
 			<check_box label="Automatische Namensvorhersage in „Chat in der Nähe“-Eingabezeile aktivieren" name="FSChatbarNamePrediction"/>
 			<check_box name="AllowMUpose" label="„:“ als Synonym für &quot;/me&quot; verwenden"/>
 			<check_box name="AutoCloseOOC" label="((OOC))-Klammern automatisch schließen"/>
-			<check_box name="FSShowIMSendButton" label="Senden-Button in Eingabezeile für IM-Sitzungen anzeigen"/>
 			<check_box name="FSShowEmojiButton" label="Emoji-Button in Eingabezeile für Lokaler Chat IM-Sitzungen anzeigen"/>
+			<check_box name="FSShowIMSendButton" label="Senden-Button in Eingabezeile für IM-Sitzungen anzeigen"/>
 			<check_box name="FSNearbyChatbar" label="Eingabezeile zum Fenster Lokaler Chat hinzufügen"/>
 			<check_box name="FSShowChatChannel" label="Kanalauswahl in Eingabezeile anzeigen"/>
 			<check_box name="FSShowChatType" label="Chat-Typ/Senden-Button anzeigen"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 87029ce152..258742d022 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -910,9 +910,9 @@
 		 top_pad="1"
 		 height="16"
 		 width="400"
-		 control_name="FSShowIMSendButton"
-		 name="FSShowIMSendButton"
-		 label="Show send chat button in chat bar for IM sessions"/>
+		 control_name="FSSuppressEmojiWindowPopupWhileTyping"
+		 name="FSSuppressEmojiWindowPopupWhileTyping"
+		 label="Suppress emoji chooser window from automatically popping up while typing in chat bars"/>
 		<check_box
 		 layout="topleft"
 		 top_pad="1"
@@ -921,6 +921,14 @@
 		 control_name="FSShowEmojiButton"
 		 name="FSShowEmojiButton"
 		 label="Show emoji button in chat bar for IM sessions and Nearby Chat"/>
+		<check_box
+		 layout="topleft"
+		 top_pad="1"
+		 height="16"
+		 width="400"
+		 control_name="FSShowIMSendButton"
+		 name="FSShowIMSendButton"
+		 label="Show send chat button in chat bar for IM sessions"/>
 		<check_box
 		 layout="topleft"
 		 top_pad="1"
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index aa4a1838da..1890053353 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -141,8 +141,9 @@
 			<check_box label="Włącz automatyczne odgadywanie imion w pasku czatu w pobliżu" name="FSChatbarNamePrediction"/>
 			<check_box name="AllowMUpose" label="&quot;:&quot; synonimem dla &quot;/me&quot;"/>
 			<check_box name="AutoCloseOOC" label="Domykaj ((nawiasy)) dla czatu OOC"/>
-			<check_box name="FSShowIMSendButton" label="Pokaż przycisk wysyłania wiadomości w pasku czatu dla sesji IM"/>
+			<check_box name="FSSuppressEmojiWindowPopupWhileTyping" label="Wyłącz automatyczne wyświetlanie okna wyboru emoji podczas pisania w paskach czatu"/>
 			<check_box name="FSShowEmojiButton" label="Pokaż przycisk emoji w pasku czatu dla sesji IM i czatu w pobliżu"/>
+			<check_box name="FSShowIMSendButton" label="Pokaż przycisk wysyłania wiadomości w pasku czatu dla sesji IM"/>
 			<check_box name="FSNearbyChatbar" label="Dodaj pasek czatu do okna czatu w pobliżu"/>
 			<check_box name="FSShowChatChannel" label="Oferuj ręczny wybór kanału w pasku czatu"/>
 			<check_box name="FSShowChatType" label="Pokaż typ czatu i przycisk wysyłania"/>

From 6361932c213cf7a19d8984e3b064113403a89ad7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 4 Mar 2024 16:02:49 +0100
Subject: [PATCH 17/38] Invert setting

---
 indra/newview/app_settings/settings.xml                     | 6 +++---
 .../newview/skins/default/xui/de/panel_preferences_chat.xml | 1 +
 .../newview/skins/default/xui/en/panel_preferences_chat.xml | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a66b4cf24a..f08f727b2f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -26748,16 +26748,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>FSSuppressEmojiWindowPopupWhileTyping</key>
+    <key>FSEnableEmojiWindowPopupWhileTyping</key>
     <map>
       <key>Comment</key>
-      <string>Suppress emoji chooser window from automatically popping up while typing in chat bars.</string>
+      <string>Enables automatic opening of emoji chooser window while typing in chat bars.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
 </map>
 </llsd>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index ab9ab1fe22..b9a11d2c73 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -147,6 +147,7 @@
 			<check_box label="Automatische Namensvorhersage in „Chat in der Nähe“-Eingabezeile aktivieren" name="FSChatbarNamePrediction"/>
 			<check_box name="AllowMUpose" label="„:“ als Synonym für &quot;/me&quot; verwenden"/>
 			<check_box name="AutoCloseOOC" label="((OOC))-Klammern automatisch schließen"/>
+			<check_box name="FSEnableEmojiWindowPopupWhileTyping" label="Automatisches Emoji-Auswahlfenster beim Chateingabe aktivieren"/>
 			<check_box name="FSShowEmojiButton" label="Emoji-Button in Eingabezeile für Lokaler Chat IM-Sitzungen anzeigen"/>
 			<check_box name="FSShowIMSendButton" label="Senden-Button in Eingabezeile für IM-Sitzungen anzeigen"/>
 			<check_box name="FSNearbyChatbar" label="Eingabezeile zum Fenster Lokaler Chat hinzufügen"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 258742d022..947fe1b29a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -910,9 +910,9 @@
 		 top_pad="1"
 		 height="16"
 		 width="400"
-		 control_name="FSSuppressEmojiWindowPopupWhileTyping"
-		 name="FSSuppressEmojiWindowPopupWhileTyping"
-		 label="Suppress emoji chooser window from automatically popping up while typing in chat bars"/>
+		 control_name="FSEnableEmojiWindowPopupWhileTyping"
+		 name="FSEnableEmojiWindowPopupWhileTyping"
+		 label="Enable automatic emoji picker window while typing in chat bars"/>
 		<check_box
 		 layout="topleft"
 		 top_pad="1"

From ebcafcfa58634ab7c10fd7185149361616f0fba8 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 4 Mar 2024 16:04:15 +0100
Subject: [PATCH 18/38] Not doing it half-way would help...

---
 indra/llui/llemojihelper.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index d60b2da8ce..cf431b4039 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -58,8 +58,8 @@ bool LLEmojiHelper::isActive(const LLUICtrl* ctrl_p) const
 bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S32* pShortCodePos)
 {
 	// <FS:PP> FIRE-33735: Option to suppress emoji chooser window from automatically popping up while typing in chat bars
-	static LLCachedControl<bool> FSSuppressEmojiWindowPopupWhileTyping(*LLUI::getInstance()->mSettingGroups["config"], "FSSuppressEmojiWindowPopupWhileTyping");
-	if (FSSuppressEmojiWindowPopupWhileTyping)
+	static LLUICachedControl<bool> FSEnableEmojiWindowPopupWhileTyping("FSEnableEmojiWindowPopupWhileTyping");
+	if (!FSEnableEmojiWindowPopupWhileTyping)
 	{
 		return false;
 	}

From a255859b7d7ad23788835768c1f95dbffb683854 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Mon, 4 Mar 2024 17:50:45 +0100
Subject: [PATCH 19/38] Updated Polish translation

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

diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index 1890053353..787378f246 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -141,7 +141,7 @@
 			<check_box label="Włącz automatyczne odgadywanie imion w pasku czatu w pobliżu" name="FSChatbarNamePrediction"/>
 			<check_box name="AllowMUpose" label="&quot;:&quot; synonimem dla &quot;/me&quot;"/>
 			<check_box name="AutoCloseOOC" label="Domykaj ((nawiasy)) dla czatu OOC"/>
-			<check_box name="FSSuppressEmojiWindowPopupWhileTyping" label="Wyłącz automatyczne wyświetlanie okna wyboru emoji podczas pisania w paskach czatu"/>
+			<check_box name="FSEnableEmojiWindowPopupWhileTyping" label="Włącz automatyczne wyświetlanie okna wyboru emoji podczas pisania w paskach czatu"/>
 			<check_box name="FSShowEmojiButton" label="Pokaż przycisk emoji w pasku czatu dla sesji IM i czatu w pobliżu"/>
 			<check_box name="FSShowIMSendButton" label="Pokaż przycisk wysyłania wiadomości w pasku czatu dla sesji IM"/>
 			<check_box name="FSNearbyChatbar" label="Dodaj pasek czatu do okna czatu w pobliżu"/>

From c9f88a1ca405bddc07440254705f710863374f44 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 5 Mar 2024 12:05:14 +0100
Subject: [PATCH 20/38] Ditch some files we don't need

---
 doc/releasenotes-where.txt |   5 -----
 doc/sl-logo-dark.png       | Bin 18028 -> 0 bytes
 doc/sl-logo.png            | Bin 9630 -> 0 bytes
 3 files changed, 5 deletions(-)
 delete mode 100755 doc/releasenotes-where.txt
 delete mode 100644 doc/sl-logo-dark.png
 delete mode 100644 doc/sl-logo.png

diff --git a/doc/releasenotes-where.txt b/doc/releasenotes-where.txt
deleted file mode 100755
index 4af5866905..0000000000
--- a/doc/releasenotes-where.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-For full release notes, see:
-	http://wiki.secondlife.com/wiki/Release_Notes
-
-For a log of viewer changes, see:
-	doc/viewer-changes.txt
diff --git a/doc/sl-logo-dark.png b/doc/sl-logo-dark.png
deleted file mode 100644
index fa9ef32aea03eef5d740df05964bb60ddd8b05fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18028
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
RwtWX6FRcQuk~I48zW_qg{=NVJ

diff --git a/doc/sl-logo.png b/doc/sl-logo.png
deleted file mode 100644
index b9563c7ac73374b7fc8e2735f27bc9e2c59792e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9630
zcmZ{KWl$VEv^Fd(THM{;-J!S?x8lWJi$k%+U0bxUus|0mP>TBk#R?QCP$;_i;uLo-
z?|k$9xIgY>k~2ATp5#n&COPvYiMraVI9QZeNJvOH>S{{*FY@lChG3w*w4W@rw_gOR
zlf0HZ5>i7t_Ja-ZrB83Crmyv4!-|9y8T0?_BN0eQ{`^Qt`_@QEl6go-WZp#`deSep
zXtr-um5`qQE8y-g*)JM&KXol-^lfA+WFXN9FB%aN5_6cklDuKi;?d{eJnFZ>#}O-y
zuI2gDj<qe^OJ}?%+FjPKhD2H0;mmOSMiy~=5Q7wh6#fWWE;hq!cz-MvMjUF9+n<9U
zLsR5b+}y7}d6-%?{mrWNXPy`lDrlC9=<+v|kumbu_BWcmNH~|(k^5e;zj*gycWJHu
zbz`Za!1EjmH?mpOZd4eIeV*9y4p&Cnk*45{EAy5m3<u^G*%%c7$3I1ZW5ZOy8^G0p
z0h$RW9>OzE_-EKsRIG@qVWbwU1UYacc4c6IVuFE#@C<ND3XfKUZ+;^PLOI2VBn!a9
zlS&c_LoqVJTvqs=fl`FG{HkgE0w*+RoOHYk9N*XK8`VhNqlZ+7Mmlj(`~TJA$Ou2_
z0G4k-m0k-2b}eB4N-wasAM&~2XZcS`Z@lYBtue@fU27*k%cZjNcoRo0aOzDMd4{rD
z8tU$zw|EQD_TPi<YesKcZz6AX?}=KNSk#Gr^{Wt@Yw_X?PZ1qn$9B>--27$qD1TUB
z)aP=ou)VH%l;@~IB)rm*dz#4m9YU4sceoES-niK-xzRATsAtSqK`&@4c-^!j!#m6_
zsv8k->wdx-Qg{j~!c*g8Vh%_!MY!W2>{^o6JoI@N5P|(QRos=~^xnDgPPigzaxRpb
zOpPk#KwjaAwGzvW&70&@0M7Ed*}L7E-0o><8f(0MGZ-7jN5r#*b{;ujdS;H7z6tOI
z(PABrWw7e}v?)P*;QdCw-JOC;M@9_gBNsz&8(DAHK{uZB3CByXRH95>#eBe9*4!D(
zcrHX6$b+`h#KL9w8`QM@#Or80uxM$Afxj^{(7!GJTL3~qJgK*`)E_JwA}>s%N!W+1
z2T+gy0ba&YrIhE}tn*olEE(o8a^z1b+p9ycbc6YZtZcDelVys|mT76Vl7&IC8XbcX
z$a?@YJD7FS=I%NtqSUAX$wNVu`gN7)f3CZrhP_(&xN$QFqlm1zEjFI&%;fuw_J*dn
zQEt0CC`ef3cfs+Jk51HOM$u69ptxYZr9iqLawCAyFSo9>yUhtnTDpMN1@dRfd)|)+
zHrRH*M+AGF6q>InDepBPlh;N^mvSzi24_Xs_%F<;VOTVfejMolYf7fROeLi^yRt2N
zg%%MK^s?$T)7QvS`qUAEoM4|m)Txq<<<GEX;^AxhnUy#_X2i?F;QX%qf~J={f0_28
z1r3LC7+DnP;L>OR-R@abV?!i+Gu4nYe4eufrPi{CiII7jphtbL|9I_;R!(vu0N4AC
zxf$D6!Ykhu&GBm`DP+{L0k!p4n|#yyf><Sg;Ww<g=U!rwp+mGDtYwv|-@ATw7tV?l
zsM);Ks)e)SjKAGki80L!u=`{Rbc~zOPD(}EexaJVL4vLi$oKbDBVGX~NF`}|NkzbI
z&Z7ee^!GLeE`2u$^*;*iDPz==OX-LT%Lc#={wY@s!K08a#VH4@Q@1{h7V)}bkni>5
z1=rM$5k_4D`lIXtexjqrIE2JQ!%4S<pEwgcknNwcVeN=VCwJTYHap8ANOVRP&N2J1
zEz>V*p$=Y@%arUx@w30Fw5%o^o)7Oj0EK>56JMi-le{<!G<eOsET)e8x&*x|@7s1K
zepmLheRW|cpjmCQuZIGUX|NUBp%d4nn1SFJ6t2~WG0_6wr~`##oy~0mWu&he;Ow3S
zt!k2~J%p{)A#}VT3Qu}5WHCVzkNHHiz+UtZ6Vv|c{Z$EQ_aC8Fa>uP)5R;!Wu;Hjn
zO_Cj4_=K}>_1mdu?0<Mln0IIJhkDFoDc*B^73`b)zV6jsZ@FDSZ~Ptar_3T=8nj}i
zb0pdLhS|z8^c%${pS%OIDKm0FPo{Tj&9usz{$)3lGvu$H@8KS7je+bpE8-)31(!bX
z))PJkBf?$#3<?q7#6>dKr|!kS?$1YFo(WW5h8*)a|7%xU3~&0|2BsqL{^3D?u6N*R
z?AhZR`Hb^`%&DZY2u@Z*vPvhtP8FEvGk(m!Lisn@M0tbp-ToJ=M7Nm|@0=FQDe4{L
ztyl-(=2aQ+U1B$D8PTQ10}dmRDXFgo!$ugf?)Wwj^EnY|-h(HWQN$39`Tb{TdV@(W
z;4Rw8`5WkjqzKA;8EkKifvV#;ZTp^13pb=dqPoaX2MeiViHq*G`HPa2ZgywhztF1C
zC^=Q+sixj}Q|G8&{(;Mx)q~Cqct;N9+f8A(%#T2sI?UqjGs)u`A_2ljf@9QjG(MG`
zD@_Qn*(8Ge+WJOdmI*-uXZXF{HNQd1AeR&>6Gjjyf5I3pRzE1~9yKuPE}~AQMlna*
zW=y2A&S_uyrwsHpU2BAIO|=QH6$`Ut%+Y{h>-o)H-lnUM4B;8n-=A3E+I_&DxpG7L
zN1*QgBPl#ptx<U$<GUaoP8~tBUMrwCZG*~%pX`Q*a!iL`eq@+m;U*38jq=8BnPk2p
zK2R0$MlKB?=SJPzjz;op;lrBEGKvjwIdIo%8Bsc{`(qiXY<QcyB}*-jTpBVBvWPY#
zOvi)={P1dJ3L@jud%c$$Q@HpCp10(Uy>-FRcrTHqg#aYY7<P*LW=ztNybC72Q6&zd
z!acrhP8j`i_ec`uhW|#-UvpQf+{jHV63d(KbQ(@M(AU|4s|T9H+WifuS$Wfu@H~lJ
zud>)gkoiD|R8rmX#dGVpC&k(ACJ8PRHhKxT{4FCF&sbRp>Ujm+ZZQSvZ<Z$q1(qp0
z`96_t3<U`hN*7|2mKiTIAL6bWbVs%E!p9SO*J3oc_Dx1-*iWx8POYp_%<>L=(*MvR
zKhZ6Y%-C|oMOzErWu`xTtnLjZ3?c_sgjej`7-U$##lHKimOW?7b;{N!M0u#BAcy=R
zvPuB-M)#1Jm!B+Fv?*#e@#~ka2Ab~c{ih_xMX(%N7j)-_ml^RK1t~Q3%0L7+Em#P=
zY+$?3@8<phIH|RHig`>pz5$67+4#&fK(pV#zUI3do0+1l@<p6*9O?K3td_kwhn2+u
z{1p6QETK;N!z-65vy0N%IgCZ9)>CI})rZKM#HYt&mPK1mqR*><iZ+X}?=?Q6Kg-Hf
zW!mWXKj%(YK5~?y%sOR)&bq8pt<b`gG{tg90;zs$@-Xvt2`-LuwehrRH<>CI8kF*N
zW3=uRL@%5@u1maJQ!cHELrtB$N+&W&P&?Ecb(Ffj_d0rYv!WYfC-?Ynr{upMCLwF^
z>4MEq{6;X=sr%F!=g^GGugwV^Rp};82^;9|P-vaup<f4eG966ZWcV0j9kQ&Z6y+WT
zn2GD;lZ2-0+|OsOA#|%OQ=e2Ioze%i%iKx0_AP9meKGPUO+R!9ltmZkf-n9$sgn^m
zGrUn=S<bu8oW*Pd29*r7LqszKh$B-5*uPV{POIFFboPxx0q>di7Baqr@l0czL96OX
zl3CohE1%29zLcbx*9Oxa>+OpUJLRRD&)!Nbhr=oo<k>Jg1q!O36!PT_>GhInx8k4a
z${qe>;N@2c6q1!q2<$gzI7fLhgv`(|E;+tsHsfbgYx%SRo&5bk9<8}8&_z(OT#3!3
z#5HW_Y5eK08w$+vReUGS8@&t%)vaFbx-_aj9vUatFWLCp=YuwE>M=y6f5S-^+p@lK
zh`%G%L|RjEDP6R-<vSbnQZh2ZgFvs+F>7m^04=D%h`0p48wC0j$o+4OFgt#?_NM-a
z;0*?Qffe1$KsK=75=uEXwUhkv3Bo<ff#AYtOD<)@(J|0&{9$Y4-li$LBWIz-hU~(4
znelit&qqJNLg_tyIS7?Eo$~qwg4i!iXtC;;8uBImX+x)?ciyR6E~PbU&-NZW%RBF)
z=&_LmUHA4-S#w9Oi*!zOS#(AWk#whdt*b`IvWS<YfUfa*VJf{dGB1r~Nq~2H6rv`y
zI29Yiu-EYjOQ$aBi(_(*nI&tOu_2pA3uY;Rp0luuEp0_%P0Z8GvlHvVP7g#P)>519
z-aD$tTl}FsJYvt?0|7J|{x&_+AG2mA@2$oag0JmH__D+HNfySeT5Zp2Z=1fzMi=m|
zCcYoyZN90rKU3T~FmP1wn-C?=*n2Xq>?q15Fh&-A9Ln{Vy|ZZo*T0tz7dh+B&U#Sw
z`C^uajbsEN663w@W>)r5e1330oUszkpeCq84}-B~1hiufs_-hD_{sh=3l;fURX@C{
z%AX`!B|i3&AGnxlI7ub3Ti%{P#fRC4ap9!!aK|X)Nlt{_hz{LAZH6^4sf*3!P;Z&S
zYNI2jdR;@J8C#6A23x)OUNmVuV16i1m>nYC-&@+BN2L4Xk#Y9Whh;Iwb#3(HNPNW9
z`=@T$QpP(vr=yQPf%Eiq9%TM$`)Q3TcGNd-4dcu`CMdLjNLxbK?OVY65qhQS9R$~O
z;R08-4+6`;l|jFf<fYd`M+;%_V5lzZUO^~7kSnz!lM-00JZD2EzqswMMCQv4tF;KG
z#=Jj<FYA@8D0$iX0FDUxwG{H5-wyt%EV@=X6?eU_4Zjj?Y7o_*G9P8|FBnc<i0dp_
zjkU2&J<+NM1Gn`%_6Spa*CR?`zZ4X_Pg=guYxPOxdr~V$L39L-_!qs$Z0!j~Y|7Tw
z02{zkoVnq8Wx!0bt@vE8ODrPi3r``Tm|5p)dk9I+;5Sp{U`RaTjz}?gJLYSp)X1v{
z)YhwB+~vxA+2n8w^X>FxaHpo9M3QibaKF}`W)=s8%b7vAKVAltXIYE+K4y}>v}R?Q
z(qrce68rXm^)vDE8$*Iw4JD`#<9Dq443TS`AC<Pn=lFzE`#2CBVBn?(I5g49EqeC(
z{!r-$8Chmpo-p<wd>Qf!eh!oD^P7LeQyT&K?)pj`EeIS|VgGBmG1IC-Q42<FBYG#8
zZm9fE*2GaWb0_j6G?RIf-JQ*~_5pCp2UQlp{32*HGS+7F;Gq8bh(+@1J+3QKQa_0r
zq$I|cZoZ5WyjTZoQ>f%h2n6!6bY$)$?McqN{^L<96`?`Me@xf=vk;)~Zt_<+#AKoc
z`EiQZ|D<MWL#ujvHJ&uJb_`0=8L=hke<{(_&TNCrsG_!r*<!sA`2Btt$V~60?0>Xl
z`5?4^#LI9bMoGOCdspe@;5v%XvuF7`MQbrL*h`~Q2$`PkjNX-N-f1J!^SZeQZL)y^
zgDGr3RL!Mqj$Bs#`K<%KG%}C(aq&J*N1x|os`>W;PNP(KTsSKFx)JY27|XjO$FCDC
z739T)SP7(;xHV!%H0L3Ot0l!%NoxjXM08S!$%~CwsDr}EAHO-7{BmHA$(~9M6IzH`
zd1a>L=M^Lpt`P3h41~#nLAm>un*ioRbCAxvQ(R-TXVN*&4wP2f^NNui(Lz<~B()n)
z2I{V0@{b2SF{8ce1er=!k)nMJ<*|IMi#U>zf)aBJaU&G2z-|-*WvgV10tggzq)_%I
zCti0D%*AF+tpOdpN~M^zJ0(=Y^ZZ(cTRw<0;KkEI|6R>#iv@w=oVf<~J|ryvoP|M)
z=3^I9wIh-qoeXB%PQ%ewVRfXAo3<TSpfXBD&Vh7CRhfD55>lJn;W%GEQ+gUj)V8J8
z0z77$Po8R^30vP2&Wm+~1(bP?l|**t$Q3-tlJoAU{J>h9w(-7e(F<;kw)nUE^I2W2
z7SmK8Eb1RQ^a-uENWdISYqJ%8&19iT9>ijmWQ8hxwtSx`l$CI&dt49)CGuzK4cK$7
zyC03IR7p(fDxL~%1%FGIFrcsn0bJMq8XMMiLVlfx(HWiL3_UENL)Q+&k^CRF9eiXG
z%1&oYN#@i43_P<qWNHV<<B?r5F)P<8#th(Y8n_d&BiWf3c`&<OkREQ=qvQoF1tIe=
zHp*~7Tal+FwiA(+#!o{>*nE$o>geZpiJ*R>)ycdEp2Tml?n_`NsMiOsD;JQChcyN(
zgZ$JJ8t2+}Pm5?6O#;#L7tCQ2>gQk9ueRrArab4em-rw-bAfsSGi#ZiDhwGVd$?GR
z9zQ&bn>TmH<Wgk@|7d&%x7vy&2H1(YX~mmR4`t@BU<iVCqb8Y34mpMSt$E5ktF>v;
zz^OKDoPphiHyt-V<?G`ZkS6xBH8zcNZKP*95$SH~{MIiJn2GA?ik`w^U3`W_7~K_6
zI)!ugPw8<(jUIkYZia`m^bHLz>a{nS;NN@h-A7up0TqK5FxGH+(Y@o3v1=?=ogfJf
zKkq=gq{VCNR#cT}rv=h3NNV5nyn}obnwdYrnf$OG^V`|JJ<TbbrXbIuW3duY_(c^*
zHh<PLx7n6D$Vx_+9*Y-;XX)G9D;`@{;daVU0TP$gs<;~Zw>w;FQkP}cmUuRt6Df>>
z*^XJ7odiv<pE(9(1_`9drBgw1C5j}O*i&AnN^aX2f&+M&b&(Y*O$efqx0W%YnY_$J
z5a$(Ytku{zdg^kFOJ6PD5Pdq)0Wb8Cxjpp|o_9|`4<;NkbE2=alE>zfP>*#8`npS{
zo_J3kG)VH*S_Y}Gc0-!fziK`K*vjZwIj(!ij;!B6>5dl0-j)2QOMIJ2{dR%8$Vrl4
z+r%OZm<k<C@3%f3U8=33j|!KK_Z>D`YqthmvxifJPPH=dE8_oBs)VaUP1bcXuY$Oy
zj`%f3t+73)VcQF%*tj-$Bl*)JKHvQ7QW=k|nQ|=@yBu^?97A1uM+fXWtbd}r1qK>?
z{TD8b3!T?nK=-ZzTBU@&|A}vtCW<@6n5am0r6KCF5mZwVi7La3-%6((BO_fvsxq}X
zo)`>0Lma*CjQ*CZ$NRT(WydzXE8RAIqcwvY(GvH`si82;SB-c1uUZc?5iM=|fRbhQ
zLmY3;YCCQM+4$&%ev4-d?%`Gvy@%U*L{>nFb{0x><#%pO>;$|YAN2|mewnBtL9;-}
zv`2pv@%E{OYv^@Z(R)HO-A<<_32IMDbM+S7ICb7bF9r$D-oNXA-x9v#X-P+LFu#yD
zFDOgS`nrD2MorOm)y!MZWZSwvtLBz$`}0SatU{42cNd|jzs3YkXH9xR7(xX<3y)~E
zUMaeZMamGYVRz*)8;DyR9(=p+VY5BaUWzY!*4wMMQHm}SUUE;k5&q5lN-X$$Mjb<V
z<m*Jg#tms{N7PEeIyxQ;^NQtd_IeMu;N>{RX?6Lp63iq6>|*a!fSA~kYf7ws!0kJ^
z^s3ubvRNAEZ}Nt?5Ah4=+<vH&`2JBc(1PmB#RtvVM2A9h^Vd{skM;-6b?8o|JCwPh
z)bf9dYga!|e5YN?r-+*ayg#5#YYRsfnJSW1ymmac!RFlauMQRic~ob+zpxL#y+!5e
z<O^;{lv=e2i<p9cLu0z>=0evJtxm;%|G+~TAZ3t><b-J}2p~6-&zDy76h^EnJ`gX^
zK?bMPx+rhn#BXAad=J8zQBAV;7SiZjBn?AuPw;wud8*!qnp#+}>%FQ1PGE0e?VGLc
z7KQVu{Sz+J8v*hp&|mO~lfn(%E(8t-b~`e^tx-vNuzbzx#1mn7AedIdcsEo*Vl+=K
z?>~I3NYH=ZhE5>1oPhe|0uRs>QaDp-$U=zz@Ud^%6-Z>k1(r`+RKh^3K9Ij^kg2q#
za$4VXUiZFA+5XF})Yrd5z3`3&Cap3<j`=PRn~|9{Ti_;Ayfenk_5-kI1qB~$!4m9|
ztw-vBMky)3W5J4_XvE?|c7<GN^OoAeZ$^1Fo4On1+bZc^=?<S$drb;+>DEqLO4S=P
zM(Naj{Pc}Z!ST8^gYK=8<F(46V_^7{|31af`FPR3MVwRQ%KDa-0VbgoFy4k|9IwJo
zZZ`*`aOXUF$pyxY1rK}Byyazn{J8wUiRaJYc+jpu$!_$$_uLj*dYL??S53%UDZQF4
zzlq_i(~(z=LGfxk-Zd&>p5ew}8P;SO`1MND6Ek}Fr}o5|N6HROaT-50-8q<MKD-)4
zE>^A0=+tGk#;*8j&=)~vJIH(<it(@IvNUCYLAYR-cI^6vP{dN1QuQXgkl5lu5FRuB
ztSO0)*?*tYVVV>piC0C*Rvr+Jkq<vWS<j6V?RR_PHoBrWPUmfkdZlw0h?j1P#Dv&v
zGZ+rYP;C+r9^GX$F31JUGtr*j3Om|5aqSnGr|A28y>{uLWB8Q)!XYZDOPj(iYtUcL
z1VR;SHt%`Fkv+kME^L>{c=9dEJpF`>rQ-Rk#i^$0IT#<L>t;Smirt77WvF|nnB;}P
z_i8&mE6OMcZ0WmzikCFf$_K9Nr^m%~VgECEc0B#UHQ@o7j;fyeg>IFM748W!3<h1u
zOQ-KC0)1vz6nl)}IwN1`9mP1GB=R;NNp#(sgqnkz!JP$_d)UB!q@`PE>*L2Qv28{#
zV!hLoN&NQpFZi{eoa4G-Vob+uRL_=7K1d{K?Wg-<uZ9fk;J-pi<W9J;2+x9{&O6Dl
zLKiEB`mkTvy3><vdZvyHz}ip47kwu^q_bEZW1KAl^;i{21ZRx|9M5uqUBUbC9A0A8
zo44@!C|<rpS`L9tw;nU=cpst*fM_bOytCrvc8Mx+tLWmk<FEuwRX2N7;l->Ga}Fd6
zGA|bhUW`EnQ{7k!e>>TA2GQ`ajjL)&MqqRQ>pvDS*QGHuNQBZ%SBADBav3@hVs^WR
zUc#)pz~vdJ-`teGKV<bPTi0yzPxISUZMYWn3cixV86Ot;>xJ;+LR`9Bj6Uo}pmbri
z?zbZg``A$}5?j6YYc-Ks0D&R`fxC3{nyO7`^X5^U|LRmE9t~(tI%zQPePQwJMnhfS
zLWPB@fnhlz!XfNiyAX`a=7nf~2(;v0D8Xlo{&x-?Qn*z7?qXyd_NuBM*P%GSX4QKn
z0+Z!53|6bO_lRAaNpA9h<@hKmyZiH(AVI1%LdCJ0J%R8kU&805KJ?;g-9DgZqfh6T
zzBlzjy`k58+*q%)=S&{&P1mn>SNStIA7wtBaew>CjYpO0C))B(`^y6gMl~>iSWF&o
zm_8QdD<K%>5kz={G7IU6cf*<kiQ{QuP9#kz`Lyp@nd`E`nMU55gmdFSLpji|Z*mi8
zUD5|Gtr9FqsHEytH>bw=dN@WzUA3<LK(uA4_6GCgY@uX=UmzM9I?60i(}wt<y1;Cl
zHr}9BDtx|$D^8nueFuzo65woQfnnuRRM5;ZOqS~xM8H|uC!4z`JKw6HRX3naV~m?7
z4@hjX8XH=5mqTXHpJeXgh0SVBQt(Kncgp1|dPlzzA1Ze`+i*e=V|Kc$UTm_T6tE%o
znLvSO1@}SUTPH%<f8|@T8#T#jQE~!XR(Lsfrt-Ph>f4e4;>bdbQMm(|VR^#^2P%|L
zq%{Qoi$QVsD77nrfHmmu*h@&IP|fLM8>rv6FdEPGvT=LyFqK@}!E*VlYMmLJ6>qPk
zN08o@_FS>o%8uJ7?J}Mw!@g9}FtOOsy?Q#5RO+UVZ)cbFLBC92yM)q_Wvx(3NB(hH
z1+AtzlG_imQwZwM$=>NLle!QLWKg))3;qsoWu#p6DlN+@)H6_vNR_in_OxH!iZaNo
z^ptVri7_6)YAQ9fBhkPfx?M;IPTCDr{7Cmaa}FPGqgxpX{W^!>rJm+di;l%GedmSV
zLqY9J9QbLTR+yX-&kqohGG5MSP<>Hqc}bmv8>;u?pE^J?O^w47nUs~f6-!{l{d%WU
zwXxJ}D&Ct(+MTKTp4(zUJLXIzPqAZPnCcUx|8t?9kp&*%1&QWmwppT3Vn6v0$Ouk5
z<9fk)Mu{_(Hhf*+2ugY(f9N|Qzqsh#wCix(lp#m)L~XDAZr}TBEo_%wa6KEf8|bsz
znpJGPH~=YyPC)1a9#+-cbnsuETZF_`9YI^uW8lC>ocp1c92LQ>m&_$`@mM4mK%n~*
zCOXH0gH|OZmxp3ea!((i)g75n!?d+dkmxE;r#Pc(IsPwul+D4~oBSR=q+%n-T9HNl
z+Q3_Y!Z+`4um$a<ov4z|LC^4_@=Msw?3nZf0<fe#MmYK(q)#zUzYq0%QFHH4og90W
zsHVUrB!oD1qKR+le5cM{HrkV#*W*hr;@$qcO0_g{dHBn|Ocbh23a=No=Qu0kGqmC&
zK%ZZa6`Z1B7g4z9P)4C@7iUR2YH_F_E#D*DM;l-m8NtA9T1N&Ej)VD-owBjtXB#p7
zq1mdPLrkKIZRsc7Ddb44?t8mS_iOE_I)A%Q7V1e64gzH3Hkz{}H(=l4-@1RG-TOx7
zpj<#e(v&!k=zwZ*(WtDv;}u6?%DMIPI8rq7uXArQ6+l~#TQZ!*CC>e}j?X*5CUd6J
zct0-`9?|@AKnmB49nT;?PzD<|#V%gdz*c514%d)-BF!(Y@G3P$DLVgwj;CWVfHD?`
zcpKVfr-0eD&$-5H=_Zbp9&sKDAARdGpXQ)(vY138srgkQNO<WcN=7jr^4ThuQ?Zn$
zzX0DcL))gmD*nI=4kVzEP6ILF%~}L<vbIhYTT7fEO&qX=JftvbOr_JG{}l=HCMYxb
zNz0QvWu!ZKbOOmSw_;}s?`SPWDmsvEwi4c(Gyc~?1HAsAn5;Tu^Bo+IeIcdR*a?or
zAn`(86f8WoSvqJ1`G&_H8u^Asrlaq2tut<|`*z{C{amL!(7Tu)fb8MVk2ieulWz!4
z7<)8&Ex=||4^I5#rEGTNX&AR3^4_52$rSGI?7U&{sprOwTjk*bn`aoOY+@RH<K-Uq
z*)FhC%kIIt)}P-_uyI7ak*r8^;|mcU4}9}ckzF#J&0Aoft(U#6o|gEL5AFH`YQ<i$
zlKh~*^NghAUXiFX#8tWRkJbKZYJ3!3Wk+26u&`}4I3CC?C*O0nq+fJG{G)RY>%&KV
z2kG;Eyxuj{sxyyriCqSU6L}Ih<)*$1^b)2#a>d1ic&6faQA2!xt5Jue>ZhrHWHd&x
zY&+qQ6oAbHtB~zb^SkG>({}cV;R7SfkARAwx}Ijd7i;Jv#!J*Vn85@$Kqbfa-|Oau
z8Q@N|Ysy&CABCcEV@>8_#JVQ~OwQ*QYU!RiajS~qu|h!N)(~>lvRr5RlJVm^3V2xg
zft(xx=1&*cFuPFzt&~@z!lV>>s#>_%RhPsFTW{*C2{ef^>>#|`EGuGNkAZ^>uB}Yk
z8hkI?VzcgqKg;zSd2wm;2*N8&;j0@BrM5h@^XYGKZ>C`}C#YYmCs<Bx;HQRLl?!d_
z)&EcoTcl<dshM+9$z3Jl*k(pRq?9wzxi?9loO4mG%jlOVfA|!mdB8*xP96)LXH3?J
z0d!b5wo11jxE6CP-mQkiA>$TwkA8jkj}wW8y>HISaJ6nON4Ou@mLL9@aRb6pZhO|`
zWsf8^KCZmJinOGRf#e&5wGblgI>jnfX^=l7&yrWgFL@t%z!A$!oUBJ<Pw@|iP?};T
z7#uZ2WuJV6G5&>Xd{os9dz@-;+ezdfX~CZe>_p47_^RCFVYZx#X7DPM;o2Esm|do%
za=S7<JIa)V1$&q6VbUjU&-xBD!dfh!^OGuan8PRl%)U)PY*Zv3KqsnMoVN(%R&*E7
zEk*2_F`r(lREhyklw$z2v=c}(f}Tm^+RC5KEts7GJI)K$7gRGxLr{6HgalW?nDn2C
zK6ok&@}OtNMUZ07`odoP3opM!pGM;+mA1hCi8Zdcm%_q65s0RNQ>>QfH3?$Vi(QEx
zUQLW29^Z6P(CVRc7&X&n`a=S1ogtuzD|qBm!&t+%&<dA!QD)BYC8%hUr*OIam!QLP
zV`V<U=9M)x;XJZpIlLOHYDVk~AdK6@S0!*6N7V;Smfn$N)AE#)p<#Be2Za(<(}v1W
zpur@-YV6}eQRtbh&$JVn8im>mw4z!U^UWIE9_4FJX#HAE38-OQA@g652k)A!OyYZJ
zZhV<Byi}VJ!v??n0XG4sDR^2TS3?j`0@pcpP9`bPP``_5J+Bj^rjhfLFOBlY7*Tgd
z?%&@(H>QZf_dp!MtCQm%{J^cn<NCW!RnWZvj`2Yzw-v@Kr+3XZ9ycy(jlH5bCtW}J
zov_gL=9c0!@q`U_LWJ`0tn9Q0zusA%b(&&+ph|M>r43@?d@l3=$fZb5%O*<hoYl--
zpXM=a^@3PVk6^$A>9cM2<+VfBN2F6b_!_}pY|wdEMkqD9^D-x{$ip7=%RN~}@3(}V
zd`H2Q_czx}>rco-*JprZAL`P7H4+!=yAZQmGVt=MM8emy<UOI2VT|ZER2h-a>^IK@
zFgNe?O~RSZYQ@r$WY?WZCE3Tn3HrgnMf@Gz2;MFbY6!71{WYYlkOz8qERYi-9$6ZG
z)_>$vWas!ci2ddWTIL~89se$=dWjVBe$KN=!jFDkj1-1SxDSC6^wJ>|`@6+%4i$+E
z<M_K5t-i^G4^4G($$mBUVky#h#d5+@^DP9V2-;K>VF`BehXzp(M4$)^@dV`7imSi;
zO=9s=Hu1B!@pF*0d++cfkOcV!1$g)ccm%}^`6VRzMI;3zc=*L7`T2jHR*d~GfQOg8
zi(~Nr4d|_<348%i{5OMvm!n^x&3gwVd3!Hg2YPi68z%>S2OIlfpHYYZK20I1D{Cv&
IDOiL42ZYXaivR!s


From 41766caa88a567009c91da123a8a65868e447717 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 5 Mar 2024 14:55:11 +0100
Subject: [PATCH 21/38] FIRE-33740: Fix asset blacklisting not persisting data
 anymore

---
 indra/newview/fsassetblacklist.cpp | 2 +-
 indra/newview/fsassetblacklist.h   | 2 +-
 indra/newview/llstartup.cpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/fsassetblacklist.cpp b/indra/newview/fsassetblacklist.cpp
index bd59437e4a..098543a998 100644
--- a/indra/newview/fsassetblacklist.cpp
+++ b/indra/newview/fsassetblacklist.cpp
@@ -66,7 +66,7 @@ LLAssetType::EType S32toAssetType(S32 assetindex)
 	return type;
 }
 
-void FSAssetBlacklist::initSingleton()
+void FSAssetBlacklist::init()
 {
 	mBlacklistFileName = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "asset_blacklist.xml");
 	loadBlacklist();
diff --git a/indra/newview/fsassetblacklist.h b/indra/newview/fsassetblacklist.h
index d7a90b10ff..d7fbdcb612 100644
--- a/indra/newview/fsassetblacklist.h
+++ b/indra/newview/fsassetblacklist.h
@@ -44,7 +44,7 @@ class FSAssetBlacklist : public LLSingleton<FSAssetBlacklist>
 	LLSINGLETON_EMPTY_CTOR(FSAssetBlacklist);
 
 public:
-	void initSingleton() override;
+	void init();
 	bool isBlacklisted(const LLUUID& id, LLAssetType::EType type);
 	void addNewItemToBlacklist(const LLUUID& id, const std::string& name, const std::string& region, LLAssetType::EType type, bool permanent = true, bool save = true);
 	void addNewItemToBlacklistData(const LLUUID& id, const LLSD& data, bool save = true);
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 9287f7e81c..c9b6090590 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1532,7 +1532,7 @@ bool idle_startup()
 		LLFile::mkdir(user_fonts_path_name.c_str());
 
 		// <FS:WS> Initalize Account based asset_blacklist
-		FSAssetBlacklist::instance();
+		FSAssetBlacklist::getInstance()->init();
 
 		// <FS:Techwolf Lupindo> load per grid data
 		FSData::instance().downloadAgents();

From 8e3c2dcdf6ac6dac8527cd30e89a4e32e1eb9577 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Tue, 5 Mar 2024 19:00:47 +0100
Subject: [PATCH 22/38] FIRE-33737 Italian Translation Update, by Spartaco
 Zemenis

---
 .../default/xui/it/floater_emoji_picker.xml   |  8 +++++++
 .../default/xui/it/floater_fs_im_session.xml  |  9 ++++++++
 .../default/xui/it/floater_fs_nearby_chat.xml |  9 ++++++++
 .../default/xui/it/floater_im_session.xml     |  8 +++++++
 .../default/xui/it/menu_fs_chat_options.xml   |  1 +
 .../skins/default/xui/it/menu_login.xml       |  5 +++++
 .../skins/default/xui/it/menu_viewer.xml      | 21 +++++++++++--------
 7 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/it/floater_emoji_picker.xml

diff --git a/indra/newview/skins/default/xui/it/floater_emoji_picker.xml b/indra/newview/skins/default/xui/it/floater_emoji_picker.xml
new file mode 100644
index 0000000000..e16b383095
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_emoji_picker.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="emojipicker" title="Scegli Emoji">
+	<floater.string name="title_for_recently_used" value="Usate di recente"/>
+	<floater.string name="title_for_frequently_used" value="Usate di frequente"/>
+	<text name="Dummy">
+		Nessuna emoji selezionata
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_fs_im_session.xml b/indra/newview/skins/default/xui/it/floater_fs_im_session.xml
index f77461a1f7..0e11ff3ae2 100644
--- a/indra/newview/skins/default/xui/it/floater_fs_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_fs_im_session.xml
@@ -62,9 +62,18 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="Mostra pannello emoji" />
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="Mostra/nascondi emoji recenti" />
+						</layout_panel>
 						<layout_panel name="input_button_layout_panel">
 							<button name="send_chat" label="Invia" tool_tip="Invia un messaggio IM" />
 						</layout_panel>
+						<layout_panel name="emoji_recent_layout_panel">
+							<text name="emoji_recent_empty_text">
+								Le emoji usate di recente verranno visualizzate qui
+							</text>
+						</layout_panel>
 					</layout_stack>
 				</layout_panel>
 			</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/it/floater_fs_nearby_chat.xml
index a45de16bdf..b1a94725ce 100644
--- a/indra/newview/skins/default/xui/it/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/it/floater_fs_nearby_chat.xml
@@ -27,6 +27,10 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="Mostra pannello emoji" />
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="Mostra/nascondi emoji recenti" />
+						</layout_panel>
 						<layout_panel name="input_button_layout_panel">
 							<spinner name="ChatChannel" tool_tip="Canale a cui inviare i messaggi. Abilitare in Preferenze -> Chat -> Scrittura -> Selezione canale nella barra chat"/>
 						</layout_panel>
@@ -40,6 +44,11 @@
 						</layout_panel>
 					</layout_stack>
 				</layout_panel>
+				<layout_panel name="emoji_recent_layout_panel">
+					<text name="emoji_recent_empty_text">
+						Le emoji usate di recente verranno visualizzate qui
+					</text>
+				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index d8ccb99203..56a74e6c9a 100644
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -21,11 +21,19 @@
 			</layout_panel>
 			<layout_panel name="chat_layout_panel">
 				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<button name="emoji_recent_panel_toggle_btn" tool_tip="Mostra/nascondi emoji recenti" />
+					</layout_panel>
 					<layout_panel name="input_button_layout_panel">
 						<button name="minz_btn" tool_tip="Mostra/nascondi pannello messaggi"/>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
+			<layout_panel name="emoji_recent_layout_panel">
+				<text name="emoji_recent_empty_text">
+					Le emoji usate di recente verranno visualizzate qui
+				</text>
+			</layout_panel>
 		</layout_stack>
 	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/menu_fs_chat_options.xml b/indra/newview/skins/default/xui/it/menu_fs_chat_options.xml
index 9faf966408..32f21b08cc 100644
--- a/indra/newview/skins/default/xui/it/menu_fs_chat_options.xml
+++ b/indra/newview/skins/default/xui/it/menu_fs_chat_options.xml
@@ -15,6 +15,7 @@
 	<menu_item_check label="Mostra notifiche per i nuovi messaggi" name="new_message_notification" />
 	<menu_item_check label="Mostra la barra della chat" name="show_chat_bar" />
 	<menu_item_check label="Mostra Seleziona Canale" name="show_channel_selection" />
+	<menu_item_check label="Mostra il pulsante Emoji" name="show_emoji_button" />
 	<menu_item_check label="Mostra tipo di Chat / pulsante Invio" name="show_send_button" />
 	<menu_item_check label="Mostra il pulsante Invio nelle sessioni IM" name="show_im_send_button" />
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 7cf7a386f6..90df9e75a6 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -25,6 +25,11 @@
 	<menu label="Debug" name="Debug">
 		<menu_item_call label="Impostazioni di debug" name="Debug Settings"/>
 		<menu_item_call label="Strumento anteprima XUI" name="UI Preview Tool"/>
+		<menu label="Caratteri" name="Fonts">
+			<menu_item_call label="Mostra test carattere" name="Show Font Test" />
+			<menu_item_call label="Scarica caratteri" name="Dump Fonts" />
+			<menu_item_call label="Scarica texture dei caratteri" name="Dump Font Textures" />
+		</menu>
 		<menu label="Test interfaccia utente" name="UI Tests"/>
 		<menu_item_call label="Imposta dimensioni della finestra..." name="Set Window Size..."/>
 		<menu_item_call label="Mostra i Termini del servizio (TOS)" name="TOS"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index c6bc732506..49459152e6 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -542,25 +542,28 @@
 			<menu_item_call label="Scarica Simulator Features to Nearby Chat" name="DumpSimFeaturesToChat"/>
 		</menu>
 		<menu label="UI" name="UI">
-			<menu_item_call label="Test Media browser" name="Web Browser Test"/>
-			<menu_item_check label="Test riavvio regione..." name="Region Restart Test"/>
-			<menu_item_call label="Web Content Browser" name="Web Content Browser"/>
+			<menu_item_call label="Test browser multimediale" name="Web Browser Test"/>
+			<menu_item_check label="Test riavvio regione" name="Region Restart Test"/>
+			<menu_item_call label="Browser contenuti web" name="Web Content Browser"/>
+			<menu_item_call label="Scarica caratteri" name="Dump Fonts" />
+			<menu_item_call label="Scarica texture dei caratteri" name="Dump Font Textures" />
 			<menu_item_call label="Test connessione FB" name="FB Connect Test"/>
 			<menu_item_call label="Scarica SelectMgr" name="Dump SelectMgr"/>
-			<menu_item_call label="Scarica Inventario" name="Dump Inventory"/>
-			<menu_item_call label="Scarica Timers" name="Dump Timers"/>
-			<menu_item_call label="Scarica Focus Holder" name="Dump Focus Holder"/>
+			<menu_item_call label="Scarica inventario" name="Dump Inventory"/>
+			<menu_item_call label="Scarica timers" name="Dump Timers"/>
+			<menu_item_call label="Scarica punto focale" name="Dump Focus Holder"/>
 			<menu_item_call label="Stampa info oggetto selezionato" name="Print Selected Object Info"/>
 			<menu_item_call label="Stampa info agente" name="Print Agent Info"/>
 			<menu_item_check label="Doppio clic Auto-Pilota" name="Double-ClickAuto-Pilot"/>
 			<menu_item_check label="Doppio clic Teleport" name="DoubleClick Teleport"/>
 			<menu_item_check label="Debug SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Debug clic" name="Debug Clicks"/>
-			<menu_item_check label="Debug viste" name="Debug Views"/>
-			<menu_item_check label="Debug Name Tooltips" name="Debug Name Tooltips"/>
+			<menu_item_check label="Debug visualizzazione" name="Debug Views"/>
+			<menu_item_check label="Debug Unicode" name="Debug Unicode" />
+			<menu_item_check label="Debug suggerimenti sul nome" name="Debug Name Tooltips"/>
 			<menu_item_check label="Debug eventi mouse" name="Debug Mouse Events"/>
 			<menu_item_check label="Debug tasti" name="Debug Keys"/>
-			<menu_item_check label="Debug Window Process" name="Debug WindowProc"/>
+			<menu_item_check label="Debug processi finestra" name="Debug WindowProc"/>
 		</menu>
 		<menu label="XUI" name="XUI">
 			<menu_item_call label="Ricarica impostazioni colori" name="Reload Color Settings"/>

From 1d6d5c3c52d2f5f3eee647b5570713dfa2ec39f7 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 9 Mar 2024 00:23:18 +0000
Subject: [PATCH 23/38] Use our modified font package that has B&W emoji font.

---
 autobuild.xml | 1072 ++++++++++++++++++++++---------------------------
 1 file changed, 484 insertions(+), 588 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index af517c7672..55165acdff 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -9,16 +9,6 @@
     <map>
       <key>SDL2</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1997-2023 Sam Lantinga</string>
-        <key>description</key>
-        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
-        <key>license</key>
-        <string>zlib</string>
-        <key>license_file</key>
-        <string>LICENSES/SDL.txt</string>
-        <key>name</key>
-        <string>SDL2</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -36,19 +26,21 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>zlib</string>
+        <key>license_file</key>
+        <string>LICENSES/SDL.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1997-2023 Sam Lantinga</string>
         <key>version</key>
         <string>2.24.1</string>
+        <key>name</key>
+        <string>SDL2</string>
+        <key>description</key>
+        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
       </map>
       <key>gstreamer10</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/gstreamer.txt</string>
-        <key>name</key>
-        <string>gstreamer10</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -64,19 +56,19 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/gstreamer.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
         <key>version</key>
         <string>0.10.6.294903</string>
+        <key>name</key>
+        <string>gstreamer10</string>
       </map>
       <key>breakpad</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) google</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/google_breakpad.txt</string>
-        <key>name</key>
-        <string>breakpad</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -92,19 +84,19 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/google_breakpad.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) google</string>
         <key>version</key>
         <string>2.48.0</string>
+        <key>name</key>
+        <string>breakpad</string>
       </map>
       <key>glib</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) glib project</string>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/glib.txt</string>
-        <key>name</key>
-        <string>glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -122,19 +114,19 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/glib.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) glib project</string>
         <key>version</key>
         <string>2.48.0</string>
+        <key>name</key>
+        <string>glib</string>
       </map>
       <key>fltk</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) fltk project</string>
-        <key>license</key>
-        <string>LGPL/fltk</string>
-        <key>license_file</key>
-        <string>LICENSES/fltk.txt</string>
-        <key>name</key>
-        <string>fltk</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -150,21 +142,19 @@
             <string>linux</string>
           </map>
         </map>
+        <key>license</key>
+        <string>LGPL/fltk</string>
+        <key>license_file</key>
+        <string>LICENSES/fltk.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) fltk project</string>
         <key>version</key>
         <string>1.3.5</string>
+        <key>name</key>
+        <string>fltk</string>
       </map>
       <key>jemalloc</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2002-present Jason Evans jasone@canonware.com.</string>
-        <key>description</key>
-        <string>jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support.</string>
-        <key>license</key>
-        <string>jemalloc (BSD derived)</string>
-        <key>license_file</key>
-        <string>LICENSES/jemalloc.txt</string>
-        <key>name</key>
-        <string>jemalloc</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -180,17 +170,21 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>jemalloc (BSD derived)</string>
+        <key>license_file</key>
+        <string>LICENSES/jemalloc.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2002-present Jason Evans jasone@canonware.com.</string>
         <key>version</key>
         <string>5.1.0</string>
+        <key>name</key>
+        <string>jemalloc</string>
+        <key>description</key>
+        <string>jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support.</string>
       </map>
       <key>ndPhysicsStub</key>
       <map>
-        <key>license</key>
-        <string>HACD/LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/ndPhysicsStub.txt</string>
-        <key>name</key>
-        <string>ndPhysicsStub</string>
         <key>platforms</key>
         <map>
           <key>darwin</key>
@@ -230,17 +224,15 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>HACD/LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/ndPhysicsStub.txt</string>
+        <key>name</key>
+        <string>ndPhysicsStub</string>
       </map>
       <key>glod</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2003 Jonathan Cohen, Nat Duca, David Luebke, Brenden Schubert - Johns Hopkins University and University of Virginia</string>
-        <key>license</key>
-        <string>GLOD Open-Source License   Version 1.0</string>
-        <key>license_file</key>
-        <string>LICENSES/GLOD.txt</string>
-        <key>name</key>
-        <string>glod</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -280,19 +272,19 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>GLOD Open-Source License   Version 1.0</string>
+        <key>license_file</key>
+        <string>LICENSES/GLOD.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2003 Jonathan Cohen, Nat Duca, David Luebke, Brenden Schubert - Johns Hopkins University and University of Virginia</string>
         <key>version</key>
         <string>1.0pre3.532346</string>
+        <key>name</key>
+        <string>glod</string>
       </map>
       <key>gntp-growl</key>
       <map>
-        <key>copyright</key>
-        <string>The Growl Project</string>
-        <key>description</key>
-        <string>A unified notification system for Mac OS X</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>name</key>
-        <string>gntp-growl</string>
         <key>platforms</key>
         <map>
           <key>darwin</key>
@@ -332,19 +324,17 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>copyright</key>
+        <string>The Growl Project</string>
+        <key>name</key>
+        <string>gntp-growl</string>
+        <key>description</key>
+        <string>A unified notification system for Mac OS X</string>
       </map>
       <key>discord-rpc</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2019 Discord, Inc.</string>
-        <key>description</key>
-        <string>C++ library to interface with Discord's API</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/discord-rpc.txt</string>
-        <key>name</key>
-        <string>discord-rpc</string>
         <key>platforms</key>
         <map>
           <key>windows64</key>
@@ -384,6 +374,16 @@
             <string>darwin64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/discord-rpc.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2019 Discord, Inc.</string>
+        <key>name</key>
+        <string>discord-rpc</string>
+        <key>description</key>
+        <string>C++ library to interface with Discord's API</string>
       </map>
       <key>SDL</key>
       <map>
@@ -417,18 +417,6 @@
       </map>
       <key>tracy</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017-2021, Bartosz Taudul (wolf@nereid.pl)</string>
-        <key>description</key>
-        <string>Tracy Profiler Library</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tracy_license.txt</string>
-        <key>name</key>
-        <string>tracy</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -436,9 +424,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>da7317e4a81609f624f84780f28b07de</string>
+              <string>9b6e1a1f4b0969d38a1ca8ee00aeb548</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/86972/801630/tracy-v0.7.8.563351-darwin64-563351.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110584/960613/tracy-v0.8.1.578241-darwin64-578241.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -448,22 +436,34 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b649ee6591e67d2341e886b3fc3484a7</string>
+              <string>05b72ae5d733aed7d3bf142287601cc6</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/86974/801642/tracy-v0.7.8.563351-windows64-563351.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110586/960637/tracy-v0.8.1.578241-windows64-578241.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tracy_license.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
+        <key>version</key>
+        <string>v0.8.1.578241</string>
+        <key>name</key>
+        <string>tracy</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
+        <key>description</key>
+        <string>Tracy Profiler Library</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/3p-tracy</string>
         <key>source_type</key>
         <string>git</string>
-        <key>version</key>
-        <string>v0.7.8.563351</string>
       </map>
       <key>apr_suite</key>
       <map>
@@ -895,18 +895,6 @@
       </map>
       <key>emoji_shortcodes</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://github.com/secondlife/3p-emoji-shortcodes</string>
-        <key>copyright</key>
-        <string>Copyright 2017-2019 Miles Johnson.</string>
-        <key>description</key>
-        <string>Emoji shortcodes</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/emojibase-license.txt</string>
-        <key>name</key>
-        <string>emoji_shortcodes</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -948,8 +936,20 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/emojibase-license.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2017-2019 Miles Johnson.</string>
         <key>version</key>
         <string>6.1.0.579438</string>
+        <key>name</key>
+        <string>emoji_shortcodes</string>
+        <key>canonical_repo</key>
+        <string>https://github.com/secondlife/3p-emoji-shortcodes</string>
+        <key>description</key>
+        <string>Emoji shortcodes</string>
       </map>
       <key>expat</key>
       <map>
@@ -1101,16 +1101,6 @@
       </map>
       <key>freetype</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
-        <key>description</key>
-        <string>Font rendering library</string>
-        <key>license</key>
-        <string>FreeType</string>
-        <key>license_file</key>
-        <string>LICENSES/freetype.txt</string>
-        <key>name</key>
-        <string>freetype</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1156,8 +1146,18 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>FreeType</string>
+        <key>license_file</key>
+        <string>LICENSES/freetype.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
         <key>version</key>
         <string>2.12.1.557becd</string>
+        <key>name</key>
+        <string>freetype</string>
+        <key>description</key>
+        <string>Font rendering library</string>
       </map>
       <key>glext</key>
       <map>
@@ -1373,18 +1373,6 @@
       </map>
       <key>icu4c</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-icu4c</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1995-2011 International Business Machines Corporation and others &lt;http://source.icu-project.org&gt;</string>
-        <key>description</key>
-        <string>ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software.</string>
-        <key>license</key>
-        <string>ICU, permissive non-copyleft free software license</string>
-        <key>license_file</key>
-        <string>LICENSES/icu.txt</string>
-        <key>name</key>
-        <string>icu4c</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1430,8 +1418,20 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>ICU, permissive non-copyleft free software license</string>
+        <key>license_file</key>
+        <string>LICENSES/icu.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1995-2011 International Business Machines Corporation and others &lt;http://source.icu-project.org&gt;</string>
         <key>version</key>
         <string>4.8.1-7d08d82</string>
+        <key>name</key>
+        <string>icu4c</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-icu4c</string>
+        <key>description</key>
+        <string>ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software.</string>
       </map>
       <key>jpegencoderbasic</key>
       <map>
@@ -2230,18 +2230,6 @@
       </map>
       <key>mikktspace</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-mikktspace</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
-        <key>description</key>
-        <string>Mikktspace Tangent Generator</string>
-        <key>license</key>
-        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
-        <key>license_file</key>
-        <string>mikktspace.txt</string>
-        <key>name</key>
-        <string>mikktspace</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2293,8 +2281,20 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
+        <key>license_file</key>
+        <string>mikktspace.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
         <key>version</key>
         <string>1</string>
+        <key>name</key>
+        <string>mikktspace</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-mikktspace</string>
+        <key>description</key>
+        <string>Mikktspace Tangent Generator</string>
       </map>
       <key>minizip-ng</key>
       <map>
@@ -2360,18 +2360,6 @@
       </map>
       <key>nanosvg</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-nanosvg</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2013-14 Mikko Mononen</string>
-        <key>description</key>
-        <string>NanoSVG is a simple single-header-file SVG parser and rasterizer</string>
-        <key>license</key>
-        <string>Zlib</string>
-        <key>license_file</key>
-        <string>LICENSES/nanosvg.txt</string>
-        <key>name</key>
-        <string>nanosvg</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2411,8 +2399,20 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Zlib</string>
+        <key>license_file</key>
+        <string>LICENSES/nanosvg.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2013-14 Mikko Mononen</string>
         <key>version</key>
         <string>2022.09.27</string>
+        <key>name</key>
+        <string>nanosvg</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-nanosvg</string>
+        <key>description</key>
+        <string>NanoSVG is a simple single-header-file SVG parser and rasterizer</string>
       </map>
       <key>nghttp2</key>
       <map>
@@ -2569,18 +2569,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>open-libndofdev</key>
       <map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/libndofdev.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
-        <key>version</key>
-        <string>0.3</string>
-        <key>name</key>
-        <string>open-libndofdev</string>
-        <key>description</key>
-        <string>Open Source replacement for 3DConnection SDK</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -2598,8 +2586,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/libndofdev.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
         <key>version</key>
         <string>0.13.222872202</string>
+        <key>name</key>
+        <string>open-libndofdev</string>
+        <key>description</key>
+        <string>Open Source replacement for 3DConnection SDK</string>
       </map>
       <key>openal</key>
       <map>
@@ -2949,18 +2947,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tinygltf</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
-        <key>copyright</key>
-        <string>// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many contributors.</string>
-        <key>description</key>
-        <string>tinygltf import library</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/tinygltf_license.txt</string>
-        <key>name</key>
-        <string>tinygltf</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2976,64 +2962,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/tinygltf_license.txt</string>
+        <key>copyright</key>
+        <string>// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many contributors.</string>
+        <key>version</key>
+        <string>v2.5.0</string>
+        <key>name</key>
+        <string>tinygltf</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
+        <key>description</key>
+        <string>tinygltf import library</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
         <key>source_type</key>
         <string>git</string>
-        <key>version</key>
-        <string>v2.5.0</string>
-      </map>
-      <key>tracy</key>
-      <map>
-        <key>platforms</key>
-        <map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>9b6e1a1f4b0969d38a1ca8ee00aeb548</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110584/960613/tracy-v0.8.1.578241-darwin64-578241.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
-          <key>windows64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>05b72ae5d733aed7d3bf142287601cc6</string>
-              <key>hash_algorithm</key>
-              <string>md5</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110586/960637/tracy-v0.8.1.578241-windows64-578241.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows64</string>
-          </map>
-        </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tracy_license.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
-        <key>version</key>
-        <string>v0.8.1.235e98f</string>
-        <key>name</key>
-        <string>tracy</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
-        <key>description</key>
-        <string>Tracy Profiler Library</string>
-        <key>source</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
-        <key>source_type</key>
-        <string>git</string>
-        <key>version</key>
-        <string>v0.8.1.578241</string>
       </map>
       <key>tut</key>
       <map>
@@ -3125,62 +3071,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>description</key>
         <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
       </map>
-      <key>viewer-fonts</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT, Copyright 2016-2022 Twitter, Inc. CC-BY-4.0, Copyright 2013 Joe Loughry and Terence Eden MIT</string>
-        <key>description</key>
-        <string>Viewer fonts</string>
-        <key>license</key>
-        <string>Various open source</string>
-        <key>license_file</key>
-        <string>LICENSES/fonts.txt</string>
-        <key>name</key>
-        <string>viewer-fonts</string>
-        <key>platforms</key>
-        <map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>6041bbd4001e3951f96ac3456c7906da</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113314/980656/viewer_fonts-1.579464-darwin64-579464.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>0f648faa1aee4e233330b87ce7a31727a28dffc3</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
-              <key>url</key>
-              <string>https://3p.firestormviewer.org/viewer_fonts-1.240620521-linux64-240620521.tar.zst</string>
-            </map>
-            <key>name</key>
-            <string>linux64</string>
-          </map>
-          <key>windows64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>1745ba6eec0108250446fe01d4aa065c</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113307/980631/viewer_fonts-1.579464-windows64-579464.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows64</string>
-          </map>
-        </map>
-        <key>version</key>
-        <string>1.579464</string>
-      </map>
       <key>viewer-manager</key>
       <map>
         <key>platforms</key>
@@ -3351,18 +3241,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>vulkan_gltf</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>description</key>
-        <string>Vulkan GLTF Sample Implementation</string>
-        <key>license</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>license_file</key>
-        <string>LICENSES/vulkan_gltf.txt</string>
-        <key>name</key>
-        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -3402,8 +3280,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
+        <key>license_file</key>
+        <string>LICENSES/vulkan_gltf.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
         <key>version</key>
         <string>1</string>
+        <key>name</key>
+        <string>vulkan_gltf</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
+        <key>description</key>
+        <string>Vulkan GLTF Sample Implementation</string>
       </map>
       <key>xxhash</key>
       <map>
@@ -3539,6 +3429,40 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>description</key>
         <string>zlib data compression library for the next generation systems</string>
       </map>
+      <key>viewer-fonts</key>
+      <map>
+        <key>platforms</key>
+        <map>
+          <key>common</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>deb47841d8e6c82fe9704aaa79d62846</string>
+              <key>hash_algorithm</key>
+              <string>md5</string>
+              <key>url</key>
+              <string>file:///D:\src\3p-viewer-fonts\viewer_fonts-1.240681616-common-240681616.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>common</string>
+          </map>
+        </map>
+        <key>license</key>
+        <string>Various open source</string>
+        <key>license_file</key>
+        <string>LICENSES/fonts.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT, Copyright 2016-2022 Twitter, Inc. CC-BY-4.0, Copyright 2013 Joe Loughry and Terence Eden MIT</string>
+        <key>version</key>
+        <string>1.240681616</string>
+        <key>name</key>
+        <string>viewer-fonts</string>
+        <key>canonical_repo</key>
+        <string>https://github.com/secondlife/3p-viewer-fonts</string>
+        <key>description</key>
+        <string>Viewer fonts</string>
+      </map>
     </map>
     <key>package_description</key>
     <map>
@@ -3560,7 +3484,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -3580,11 +3504,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -3601,7 +3525,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -3621,29 +3545,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
             <key>ReleaseFS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--build</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3654,26 +3566,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--config</string>
                   <string>--version</string>
                   <string>--opensim</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--build</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseFS</string>
             </map>
             <key>ReleaseFS_AVX</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--build</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-                  <string>--avx</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3685,26 +3596,26 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--version</string>
                   <string>--opensim</string>
                   <string>--avx</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--build</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+                  <string>--avx</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseFS_AVX</string>
             </map>
             <key>ReleaseFS_AVX2</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--build</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-                  <string>--avx2</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3716,25 +3627,26 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--version</string>
                   <string>--opensim</string>
                   <string>--avx2</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--build</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+                  <string>--avx2</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseFS_AVX2</string>
             </map>
             <key>ReleaseFS_open</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--build</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3745,26 +3657,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--config</string>
                   <string>--version</string>
                   <string>--opensim</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--build</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseFS_open</string>
             </map>
             <key>RelWithDebInfoFS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--btype RelWithDebInfo</string>
-                  <string>--build</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3776,26 +3687,26 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--config</string>
                   <string>--version</string>
                   <string>--opensim</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--btype RelWithDebInfo</string>
+                  <string>--build</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+</array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS</string>
             </map>
             <key>RelWithDebInfoFS_open</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--btype RelWithDebInfo</string>
-                  <string>--build</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3807,7 +3718,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--config</string>
                   <string>--version</string>
                   <string>--opensim</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--btype RelWithDebInfo</string>
+                  <string>--build</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+</array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS_open</string>
@@ -3828,11 +3752,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -3845,12 +3769,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-                </array>
+</array>
               </map>
-              <!-- FS:Ansariel: This will cause packages being installed twice
-              <key>default</key>
-              <string>True</string>
-              -->
               <key>name</key>
               <string>RelWithDebInfo</string>
             </map>
@@ -3862,7 +3782,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -3875,7 +3795,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -3884,19 +3804,15 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -3909,7 +3825,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>Release</string>
@@ -3922,7 +3838,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -3935,23 +3851,13 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
             <key>RelWithDebInfoFS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--package</string>
-                  <string>--platform darwin</string>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -3960,47 +3866,44 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--package</string>
                   <string>--fmodstudio</string>
                   <string>--kdu</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--package</string>
+                  <string>--platform darwin</string>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+</array>
               </map>
-              <!-- FS:Ansariel: This will cause packages being installed twice
-              <key>default</key>
-              <string>True</string>
-              -->
               <key>name</key>
               <string>RelWithDebInfoFS</string>
             </map>
             <key>RelWithDebInfoFS_open</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--package</string>
-                  <string>--platform darwin</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--platform darwin</string>
                   <string>--package</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--package</string>
+                  <string>--platform darwin</string>
+</array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS_open</string>
             </map>
             <key>ReleaseFS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform darwin</string>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4008,28 +3911,37 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--platform darwin</string>
                   <string>--kdu</string>
                   <string>--fmodstudio</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform darwin</string>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+</array>
               </map>
               <key>default</key>
               <string>True</string>
               <key>name</key>
               <string>ReleaseFS</string>
             </map>
-             <key>ReleaseFS_open</key>
+            <key>ReleaseFS_open</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform darwin</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--platform darwin</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform darwin</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseFS_open</string>
@@ -4053,21 +3965,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
                 <key>command</key>
                 <string>ninja</string>
               </map>
-              <!-- FS:Ansariel: This will cause packages being installed twice
-              <key>default</key>
-              <string>True</string>
-              -->
               <key>name</key>
               <string>Release</string>
             </map>
@@ -4080,7 +3988,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -4100,14 +4008,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>RelWithDebInfoFS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform linux</string>
-                  <string>--package</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4116,46 +4016,42 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--fmodstudio</string>
                   <string>--platform linux</string>
                   <string>--package</string>
-                </array>
+</array>
               </map>
-              <!-- FS:Ansariel: This will cause packages being installed twice
-              <key>default</key>
-              <string>True</string>
-              -->
-              <key>name</key>
-              <string>RelWithDebInfoFS</string>
-            </map>
-            <key>RelWithDebInfoFS_open</key>
-            <map>
               <key>build</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--platform linux</string>
                   <string>--package</string>
-                </array>
+</array>
               </map>
+              <key>name</key>
+              <string>RelWithDebInfoFS</string>
+            </map>
+            <key>RelWithDebInfoFS_open</key>
+            <map>
               <key>configure</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--platform linux</string>
                   <string>--package</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform linux</string>
+                  <string>--package</string>
+</array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS_open</string>
             </map>
             <key>ReleaseFS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--build</string>
-                  <string>--platform linux</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4163,7 +4059,15 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--fmodstudio</string>
                   <string>--platform linux</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--build</string>
+                  <string>--platform linux</string>
+</array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -4172,6 +4076,14 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>ReleaseFS_open</key>
             <map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform linux</string>
+                  <string>--package</string>
+</array>
+              </map>
               <key>build</key>
               <map>
                 <key>options</key>
@@ -4179,15 +4091,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--build</string>
                   <string>--platform linux</string>
                   <string>--package</string>
-                </array>
-              </map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform linux</string>
-                  <string>--package</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseFS_open</string>
@@ -4212,11 +4116,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -4226,16 +4130,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>/build</string>
                   <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-                </array>
+</array>
               </map>
-              <!-- FS:Ansariel: This will cause packages being installed twice
-              <key>default</key>
-              <string>True</string>
-              -->
               <key>name</key>
               <string>RelWithDebInfo</string>
             </map>
@@ -4252,11 +4152,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DUSE_OPENAL:BOOL=ON</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -4270,11 +4170,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -4289,11 +4189,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -4303,11 +4203,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>/build</string>
                   <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>Release</string>
@@ -4326,11 +4226,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DUSE_OPENAL:BOOL=ON</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-                </array>
+</array>
               </map>
               <key>build</key>
               <map>
@@ -4344,27 +4244,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-                </array>
+</array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
             <key>RelWithDebInfoFS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4373,26 +4263,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--version</string>
                   <string>--platform windows</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+</array>
               </map>
-              <!-- FS:Ansariel: This will cause packages being installed twice
-              <key>default</key>
-              <string>True</string>
-              -->
               <key>name</key>
               <string>RelWithDebInfoFS</string>
             </map>
             <key>RelWithDebInfoFS_open</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--version</string>
-                  <string>--btype RelWithDebInfo</string>
-                  <string>--platform windows</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4400,23 +4287,22 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--version</string>
                   <string>--btype RelWithDebInfo</string>
                   <string>--platform windows</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--version</string>
+                  <string>--btype RelWithDebInfo</string>
+                  <string>--platform windows</string>
+</array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS_open</string>
             </map>
             <key>ReleaseFS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4425,7 +4311,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--version</string>
                   <string>--platform windows</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+</array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -4434,16 +4330,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>ReleaseFS_AVX</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4452,23 +4338,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--version</string>
                   <string>--platform windows</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseFS_AVX</string>
             </map>
             <key>ReleaseFS_AVX2</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4477,28 +4363,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--version</string>
                   <string>--platform windows</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseFS_AVX2</string>
             </map>
             <key>ReleaseFS_open</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-                </array>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--version</string>
                   <string>--platform windows</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseFS_open</string>
@@ -4526,4 +4422,4 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       <string>Firestorm Viewer</string>
     </map>
   </map>
-</llsd>
+</llsd>
\ No newline at end of file

From 425da225a6b076b6b69bf9468ee38530dc3bf9fa Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 9 Mar 2024 02:47:52 +0000
Subject: [PATCH 24/38] Add support for B&W emoji rendering.

Requires updated 3p-viewer-fonts package.
---
 indra/llrender/llfontgl.cpp                   | 18 +++++++++++--
 indra/llrender/llfontgl.h                     |  4 +--
 indra/llui/lltextbase.cpp                     |  3 ++-
 indra/llui/lltexteditor.cpp                   |  5 ++--
 indra/newview/app_settings/settings.xml       | 11 ++++++++
 indra/newview/fonts/fonts.xml                 |  5 ++++
 indra/newview/fonts/fonts_cascadia_code.xml   | 13 +++++++++
 .../fonts/fonts_celestia_medium_redux.xml     |  5 ++++
 .../newview/fonts/fonts_deja_vu_all_caps.xml  |  5 ++++
 indra/newview/fonts/fonts_droid.xml           |  5 ++++
 indra/newview/fonts/fonts_dyslexia.xml        |  5 ++++
 indra/newview/fonts/fonts_liberation.xml      |  5 ++++
 indra/newview/fonts/fonts_mobi.xml            |  5 ++++
 indra/newview/fonts/fonts_noto.xml            |  5 ++++
 indra/newview/fonts/fonts_roboto.xml          |  5 ++++
 indra/newview/fonts/fonts_ubuntu.xml          |  5 ++++
 indra/newview/llfloateremojipicker.cpp        | 20 +++++++++++---
 indra/newview/llpanelemojicomplete.cpp        |  7 ++++-
 indra/newview/skins/default/xui/en/fonts.xml  |  5 ++++
 .../default/xui/en/panel_preferences_UI.xml   | 27 ++++++++++++++++++-
 20 files changed, 150 insertions(+), 13 deletions(-)

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index d39c4eb834..37be6ef835 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -1090,16 +1090,30 @@ LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name)
 }
 
 //static
-LLFontGL* LLFontGL::getFontEmoji()
+LLFontGL* LLFontGL::getFontEmoji( bool useBW ) // <FS:Beq/> Add B&W emoji font support
 {
 	static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Large", 0));
+// <FS:Beq> Add B&W emoji font support
+	static LLFontGL* fontp_bw = getFont(LLFontDescriptor("EmojiBW", "Large", 0));
+	if( useBW )
+	{
+		return fontp_bw;
+	}
+// </FS:Beq>
 	return fontp;;
 }
 
 //static
-LLFontGL* LLFontGL::getFontEmojiHuge()
+LLFontGL* LLFontGL::getFontEmojiHuge( bool useBW ) // <FS:Beq/> Add B&W emoji font support
 {
 	static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Huge", 0));
+// <FS:Beq> Add B&W emoji font support
+	static LLFontGL* fontp_bw = getFont(LLFontDescriptor("EmojiBW", "Huge", 0));
+	if( useBW )
+	{
+		return fontp_bw;
+	}
+// </FS:Beq>
 	return fontp;;
 }
 
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 13c9e8bfce..6ba652bc48 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -194,8 +194,8 @@ public:
 
 	static void setFontDisplay(BOOL flag) { sDisplayFont = flag; }
 		
-	static LLFontGL* getFontEmoji();
-	static LLFontGL* getFontEmojiHuge();
+	static LLFontGL* getFontEmoji( bool useBW = false ); // <FS:Beq/> Add B&W emoji font support
+	static LLFontGL* getFontEmojiHuge( bool useBW = false ); // <FS:Beq/> Add B&W emoji font support
 	static LLFontGL* getFontMonospace();
 	static LLFontGL* getFontSansSerifSmall();
     static LLFontGL* getFontSansSerifSmallBold();
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 16f30d96be..978e7cf25e 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1053,6 +1053,7 @@ S32 LLTextBase::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextBase::s
 
 	// Insert special segments where necessary (insertSegment takes care of splitting normal text segments around them for us)
 	{
+		static LLUICachedControl<bool> useBWEmojis("FSUseBWEmojis", false); // <FS:Beq/> Add B&W emoji font support
 		LLStyleSP emoji_style;
 		LLEmojiDictionary* ed = LLEmojiDictionary::instanceExists() ? LLEmojiDictionary::getInstance() : NULL;
 		for (S32 text_kitty = 0, text_len = wstr.size(); text_kitty < text_len; text_kitty++)
@@ -1064,7 +1065,7 @@ S32 LLTextBase::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextBase::s
 				if (!emoji_style)
 				{
 					emoji_style = new LLStyle(getStyleParams());
-					emoji_style->setFont(LLFontGL::getFontEmoji());
+					emoji_style->setFont(LLFontGL::getFontEmoji( useBWEmojis )); // <FS:Beq/> Add B&W emoji font support
 				}
 
 				S32 new_seg_start = pos + text_kitty;
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index b9e138ac5f..9b98c60c63 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -734,9 +734,10 @@ void LLTextEditor::selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_p
 
 void LLTextEditor::insertEmoji(llwchar emoji)
 {
-	LL_INFOS() << "LLTextEditor::insertEmoji(" << wchar_utf8_preview(emoji) << ")" << LL_ENDL;
+	static LLUICachedControl<bool> useBWEmojis( "FSUseBWEmojis", false); // <FS:Beq/> Add B&W emoji font support
+	LL_DEBUGS("Emoji") << "LLTextEditor::insertEmoji(" << wchar_utf8_preview(emoji) << ")" << LL_ENDL;  // <FS:Beq/> reduce Emoji log spam
 	auto styleParams = LLStyle::Params();
-	styleParams.font = LLFontGL::getFontEmoji();
+	styleParams.font = LLFontGL::getFontEmoji( useBWEmojis ); // <FS:Beq/> Add B&W emoji font support
 	auto segment = new LLEmojiTextSegment(new LLStyle(styleParams), mCursorPos, mCursorPos + 1, *this);
 	insert(mCursorPos, LLWString(1, emoji), false, segment);
 	setCursorPos(mCursorPos + 1);
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f08f727b2f..7f50889dec 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -26759,5 +26759,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSUseBWEmojis</key>
+    <map>
+      <key>Comment</key>
+      <string>Use Black and White Emojis.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
 </map>
 </llsd>
diff --git a/indra/newview/fonts/fonts.xml b/indra/newview/fonts/fonts.xml
index 58f45e6d80..805f77b605 100644
--- a/indra/newview/fonts/fonts.xml
+++ b/indra/newview/fonts/fonts.xml
@@ -82,6 +82,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>DejaVuSansMono.ttf</file>
diff --git a/indra/newview/fonts/fonts_cascadia_code.xml b/indra/newview/fonts/fonts_cascadia_code.xml
index c854b7b2b9..693240378f 100644
--- a/indra/newview/fonts/fonts_cascadia_code.xml
+++ b/indra/newview/fonts/fonts_cascadia_code.xml
@@ -82,6 +82,19 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+  <font name="EmojiBW"
+	comment="Name of B and W emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>CascadiaCode-Light.ttf</file>
diff --git a/indra/newview/fonts/fonts_celestia_medium_redux.xml b/indra/newview/fonts/fonts_celestia_medium_redux.xml
index 7a37d265ae..817052b09f 100644
--- a/indra/newview/fonts/fonts_celestia_medium_redux.xml
+++ b/indra/newview/fonts/fonts_celestia_medium_redux.xml
@@ -82,6 +82,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>DejaVuSansMono.ttf</file>
diff --git a/indra/newview/fonts/fonts_deja_vu_all_caps.xml b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
index a40030d90b..04daf0df70 100644
--- a/indra/newview/fonts/fonts_deja_vu_all_caps.xml
+++ b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
@@ -80,6 +80,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>DejaVuSansAllCapsMono.ttf</file>
diff --git a/indra/newview/fonts/fonts_droid.xml b/indra/newview/fonts/fonts_droid.xml
index ec61de5fa6..8fd6c8846d 100644
--- a/indra/newview/fonts/fonts_droid.xml
+++ b/indra/newview/fonts/fonts_droid.xml
@@ -82,6 +82,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of black and white emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>DroidSansMono.ttf</file>
diff --git a/indra/newview/fonts/fonts_dyslexia.xml b/indra/newview/fonts/fonts_dyslexia.xml
index 98e36c4c24..7379045ab0 100644
--- a/indra/newview/fonts/fonts_dyslexia.xml
+++ b/indra/newview/fonts/fonts_dyslexia.xml
@@ -82,6 +82,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>SourceCodePro-Regular.ttf</file>
diff --git a/indra/newview/fonts/fonts_liberation.xml b/indra/newview/fonts/fonts_liberation.xml
index 343c319dd8..4164f47fa9 100644
--- a/indra/newview/fonts/fonts_liberation.xml
+++ b/indra/newview/fonts/fonts_liberation.xml
@@ -82,6 +82,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>LiberationMono-Regular.ttf</file>
diff --git a/indra/newview/fonts/fonts_mobi.xml b/indra/newview/fonts/fonts_mobi.xml
index 500cde4657..054874e20e 100644
--- a/indra/newview/fonts/fonts_mobi.xml
+++ b/indra/newview/fonts/fonts_mobi.xml
@@ -82,6 +82,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>MobiSansMono.ttf</file>
diff --git a/indra/newview/fonts/fonts_noto.xml b/indra/newview/fonts/fonts_noto.xml
index c9a35877b4..d725f2f853 100644
--- a/indra/newview/fonts/fonts_noto.xml
+++ b/indra/newview/fonts/fonts_noto.xml
@@ -82,6 +82,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>NotoMono-Regular.ttf</file>
diff --git a/indra/newview/fonts/fonts_roboto.xml b/indra/newview/fonts/fonts_roboto.xml
index 83872ff9c4..1150b74b2c 100644
--- a/indra/newview/fonts/fonts_roboto.xml
+++ b/indra/newview/fonts/fonts_roboto.xml
@@ -82,6 +82,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>MobiSansMono.ttf</file>
diff --git a/indra/newview/fonts/fonts_ubuntu.xml b/indra/newview/fonts/fonts_ubuntu.xml
index d8a99a4baf..f3007dc0ae 100644
--- a/indra/newview/fonts/fonts_ubuntu.xml
+++ b/indra/newview/fonts/fonts_ubuntu.xml
@@ -82,6 +82,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>UbuntuMono-R.ttf</file>
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 6b49756df3..3e32885047 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -41,6 +41,7 @@
 #include "llsdserialize.h"
 #include "lltextbox.h" 
 #include "llviewerchat.h" 
+#include "llviewercontrol.h"  // <FS:Beq/> Add B&W emoji font support
 
 LLFloaterEmojiPicker::recent_emojis_updated_callback_t LLFloaterEmojiPicker::sRecentEmojisUpdatedCallback{}; // <FS:Ansariel> Live-update recently used emojis
 
@@ -136,11 +137,15 @@ public:
 
     virtual void draw() override
     {
+        static LLCachedControl<bool> useBWEmojis(gSavedSettings, "FSUseBWEmojis", false); // <FS:Beq/> Add B&W emoji font support
         LLScrollingPanel::draw();
 
         F32 x = getRect().getWidth() / 2;
         F32 y = getRect().getHeight() / 2;
-        LLFontGL::getFontEmoji()->render(
+        // <FS:Beq> Add B&W emoji font support
+        // LLFontGL::getFontEmoji( useBWEmojis )->render( 
+        LLFontGL::getFontEmoji( useBWEmojis )->render( 
+        // </FS:Beq>
             mText,                      // wstr
             0,                          // begin_offset
             x,                          // x
@@ -213,7 +218,11 @@ public:
 protected:
     void drawIcon(F32 x, F32 y, S32 max_pixels)
     {
-        LLFontGL::getFontEmojiHuge()->render(
+        // <FS:Beq> Add B&W emoji font support
+        // LLFontGL::getFontEmojiHuge()->render(
+        static LLCachedControl<bool> useBWEmojis(gSavedSettings, "FSUseBWEmojis", false);
+        LLFontGL::getFontEmojiHuge( useBWEmojis )->render(
+        // </FS:Beq>
             mWStr,                      // wstr
             0,                          // begin_offset
             x,                          // x
@@ -229,9 +238,11 @@ protected:
 
     void drawName(F32 x, F32 y, S32 max_pixels, LLColor4& color)
     {
+        static LLCachedControl<bool> useBWEmojis(gSavedSettings, "FSUseBWEmojis", false); // <FS:Beq/> Add B&W emoji font support
+
         F32 x0 = x;
         F32 x1 = max_pixels;
-        LLFontGL* font = LLFontGL::getFontEmoji();
+        LLFontGL* font = LLFontGL::getFontEmoji( useBWEmojis ); // <FS:Beq/> Add B&W emoji font support
         if (mBegin)
         {
             std::string text = mTitle.substr(0, mBegin);
@@ -415,6 +426,7 @@ void LLFloaterEmojiPicker::initialize()
 
 void LLFloaterEmojiPicker::fillGroups()
 {
+    static LLCachedControl<bool> useBWEmojis(gSavedSettings, "FSUseBWEmojis", false); // <FS:Beq/> Add B&W emoji font support
     // Do not use deleteAllChildren() because mBadge shouldn't be removed
     for (LLButton* button : mGroupButtons)
     {
@@ -425,7 +437,7 @@ void LLFloaterEmojiPicker::fillGroups()
     mGroupButtons.clear();
 
     LLButton::Params params;
-    params.font = LLFontGL::getFontEmoji();
+    params.font = LLFontGL::getFontEmoji( useBWEmojis ); // <FS:Beq/> Add B&W emoji font support
 
     LLRect rect;
     rect.mTop = mGroups->getRect().getHeight();
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index e6e3a10e13..fe8ee69597 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -31,6 +31,7 @@
 #include "llpanelemojicomplete.h"
 #include "llscrollbar.h"
 #include "lluictrlfactory.h"
+#include "llviewercontrol.h"  // <FS:Beq/> Add B&W emoji font support
 
 constexpr U32 MIN_MOUSE_MOVE_DELTA = 4;
 constexpr U32 MIN_SHORT_CODE_WIDTH = 100;
@@ -60,10 +61,14 @@ LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p
     , mMaxVisible(p.max_visible)
     , mPadding(p.padding)
     , mSelectedImage(p.selected_image)
-    , mIconFont(LLFontGL::getFontEmojiHuge())
+    // , mIconFont(LLFontGL::getFontEmojiHuge()) // <FS:Beq/> Add B&W emoji font support
     , mTextFont(LLFontGL::getFontSansSerifBig())
     , mScrollbar(nullptr)
 {
+    // <FS:Beq> Add B&W emoji font support
+    static LLCachedControl<bool> useBWEmojis(gSavedSettings, "FSUseBWEmojis");
+    mIconFont = LLFontGL::getFontEmojiHuge( useBWEmojis );
+    // </FS:Beq>
     if (mVertical)
     {
         LLScrollbar::Params sbparams;
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 8a25816f3f..4b8d044063 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -75,6 +75,11 @@
     <file>TwemojiSVG.ttf</file>
   </font>
 
+  <font name="EmojiBW"
+	comment="Name of Black and White emoji font">
+    <file>NotoEmoji-Regular.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>DejaVuSansMono.ttf</file>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index e0e5d7ab7c..992f19375a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -1806,7 +1806,32 @@ Default 0. Larger values may not work well.
              <combo_item name="Medium" value="Medium" label="Medium"/>
              <combo_item name="Large" value="Large" label="Large"/>
         </combo_box>
-
+        <text
+         top_pad="20"
+         left="10"
+         follows="left|top"
+         name="emoji_font_settings_label"
+         width="120">
+          Emoji Font Settings:
+        </text>
+        <check_box
+        control_name="FSUseBWEmojis"
+        height="16"
+        label="Display emojis in monochrome:"
+        layout="topleft"
+        left="15"
+        name="FSUseBWEmojis"
+        top_pad="13"
+        width="215" />
+        <check_box
+        control_name="FSUsePrettyEmojiButton"
+        height="16"
+        label="Use pretty Emoji button:"
+        layout="topleft"
+        left="15"
+        name="FSUsePrettyEmojiButton"
+        top_pad="3"
+        width="215" />
 <!-- not a live preview
         <text
          name="tooltip_textbox"

From 6b3339609e8ca74e8ec3e82cdc1c644f3ddebc49 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 10 Mar 2024 02:57:50 +0000
Subject: [PATCH 25/38] support user selected b&w/colour in fallback
 rendering.+ emoji button

Allow emoji in button text on emoji picker (visually shows the mono/colour mode)
debug setting allows user to pic a custom label cos why not.
---
 indra/llrender/llfontregistry.cpp             | 27 +++++++++++++++++++
 indra/llrender/llfontregistry.h               |  4 +++
 indra/newview/app_settings/settings.xml       | 22 +++++++++++++++
 indra/newview/fonts/fonts.xml                 |  3 ++-
 indra/newview/fonts/fonts_cascadia_code.xml   | 13 +++------
 .../fonts/fonts_celestia_medium_redux.xml     |  3 ++-
 .../newview/fonts/fonts_deja_vu_all_caps.xml  |  3 ++-
 indra/newview/fonts/fonts_droid.xml           |  3 ++-
 indra/newview/fonts/fonts_dyslexia.xml        |  3 ++-
 indra/newview/fonts/fonts_liberation.xml      |  3 ++-
 indra/newview/fonts/fonts_mobi.xml            |  3 ++-
 indra/newview/fonts/fonts_noto.xml            |  3 ++-
 indra/newview/fonts/fonts_roboto.xml          |  3 ++-
 indra/newview/fonts/fonts_ubuntu.xml          |  3 ++-
 indra/newview/fsfloaterim.cpp                 | 14 ++++++++++
 indra/newview/fsfloaternearbychat.cpp         | 14 ++++++++++
 .../default/xui/en/floater_fs_im_session.xml  | 20 +++++++-------
 .../default/xui/en/floater_fs_nearby_chat.xml | 14 +++++-----
 indra/newview/skins/default/xui/en/fonts.xml  |  3 ++-
 .../default/xui/en/panel_preferences_UI.xml   |  3 +--
 20 files changed, 125 insertions(+), 39 deletions(-)

diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 0e12f5225d..7e5f215a76 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -47,8 +47,35 @@ bool init_from_xml(LLFontRegistry* registry, LLXMLNodePtr node);
 const std::string MACOSX_FONT_PATH_LIBRARY = "/Library/Fonts/";
 const std::string MACOSX_FONT_SUPPLEMENTAL = "Supplemental/";
 
+
+
+// <FS:Beq> font functors with UI control access
+static bool isEmojiUseBW(llwchar wch)
+{
+	static LLCachedControl<bool> emoji_use_bw(gSavedSettings, "FSUseEmojiBW", false);
+	if(emoji_use_bw)
+	{
+		return (LLStringOps::isEmoji(wch));
+	}
+	return false;
+}
+
+
+// static
+static bool isEmojiUseColor(llwchar wch)
+{
+	static LLCachedControl<bool> emoji_use_bw(gSavedSettings, "FSUseEmojiBW", false);
+	if(!emoji_use_bw)
+	{
+		return (LLStringOps::isEmoji(wch));
+	}
+	return false;
+}
+// </FS:Beq>
 LLFontDescriptor::char_functor_map_t LLFontDescriptor::mCharFunctors({
 	{ "is_emoji", LLStringOps::isEmoji }
+	, { "is_emoji_use_color", isEmojiUseColor }
+	, { "is_emoji_use_bw", isEmojiUseBW }
 });
 
 LLFontDescriptor::LLFontDescriptor():
diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h
index 4d8c9ed544..4746348b41 100644
--- a/indra/llrender/llfontregistry.h
+++ b/indra/llrender/llfontregistry.h
@@ -34,6 +34,10 @@ class LLFontGL;
 
 typedef std::vector<std::string> string_vec_t;
 
+// <FS:Beq> preference aware font functors
+static bool isEmojiUseBW(llwchar wch);
+static bool isEmojiUseColor(llwchar wch);
+// </FS:Beq>
 struct LLFontFileInfo
 {
 	LLFontFileInfo(const std::string& file_name, const std::function<bool(llwchar)>& char_functor = nullptr)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7f50889dec..0213ca17d7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -26770,5 +26770,27 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSUsePrettyEmojiButton</key>
+    <map>
+      <key>Comment</key>
+      <string>Use an emoji for the emoji button.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FSPrettyEmojiButtonCode</key>
+    <map>
+      <key>Comment</key>
+      <string>Decimal code for the emoji button. Try 128569 or 128571 for example</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>128578</integer>
+    </map>
 </map>
 </llsd>
diff --git a/indra/newview/fonts/fonts.xml b/indra/newview/fonts/fonts.xml
index 805f77b605..e3a0b1f3e8 100644
--- a/indra/newview/fonts/fonts.xml
+++ b/indra/newview/fonts/fonts.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSans.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fonts/fonts_cascadia_code.xml b/indra/newview/fonts/fonts_cascadia_code.xml
index 693240378f..895cf7eabb 100644
--- a/indra/newview/fonts/fonts_cascadia_code.xml
+++ b/indra/newview/fonts/fonts_cascadia_code.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>CascadiaCode-Light.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
@@ -83,15 +84,7 @@
   </font>
 
   <font name="EmojiBW"
-	comment="Name of emoji font">
-    <file>NotoEmoji-Regular.ttf</file>
-  </font>
-  <font name="EmojiBW"
-	comment="Name of emoji font">
-    <file>NotoEmoji-Regular.ttf</file>
-  </font>
-  <font name="EmojiBW"
-	comment="Name of B and W emoji font">
+	comment="Name of Black and White emoji font">
     <file>NotoEmoji-Regular.ttf</file>
   </font>
 
diff --git a/indra/newview/fonts/fonts_celestia_medium_redux.xml b/indra/newview/fonts/fonts_celestia_medium_redux.xml
index 817052b09f..6b28aee211 100644
--- a/indra/newview/fonts/fonts_celestia_medium_redux.xml
+++ b/indra/newview/fonts/fonts_celestia_medium_redux.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>CelestiaMediumRedux1.55.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fonts/fonts_deja_vu_all_caps.xml b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
index 04daf0df70..8780cc6262 100644
--- a/indra/newview/fonts/fonts_deja_vu_all_caps.xml
+++ b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSansAllCaps.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fonts/fonts_droid.xml b/indra/newview/fonts/fonts_droid.xml
index 8fd6c8846d..5e575b984f 100644
--- a/indra/newview/fonts/fonts_droid.xml
+++ b/indra/newview/fonts/fonts_droid.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>DroidSans.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fonts/fonts_dyslexia.xml b/indra/newview/fonts/fonts_dyslexia.xml
index 7379045ab0..b41fdc1306 100644
--- a/indra/newview/fonts/fonts_dyslexia.xml
+++ b/indra/newview/fonts/fonts_dyslexia.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>MobiSans.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fonts/fonts_liberation.xml b/indra/newview/fonts/fonts_liberation.xml
index 4164f47fa9..0261b75696 100644
--- a/indra/newview/fonts/fonts_liberation.xml
+++ b/indra/newview/fonts/fonts_liberation.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>LiberationSans-Regular.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fonts/fonts_mobi.xml b/indra/newview/fonts/fonts_mobi.xml
index 054874e20e..d9f6db65f9 100644
--- a/indra/newview/fonts/fonts_mobi.xml
+++ b/indra/newview/fonts/fonts_mobi.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>MobiSans.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fonts/fonts_noto.xml b/indra/newview/fonts/fonts_noto.xml
index d725f2f853..d57a8c209c 100644
--- a/indra/newview/fonts/fonts_noto.xml
+++ b/indra/newview/fonts/fonts_noto.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>NotoSans.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fonts/fonts_roboto.xml b/indra/newview/fonts/fonts_roboto.xml
index 1150b74b2c..18fad6b060 100644
--- a/indra/newview/fonts/fonts_roboto.xml
+++ b/indra/newview/fonts/fonts_roboto.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>DroidSans.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fonts/fonts_ubuntu.xml b/indra/newview/fonts/fonts_ubuntu.xml
index f3007dc0ae..08d6051436 100644
--- a/indra/newview/fonts/fonts_ubuntu.xml
+++ b/indra/newview/fonts/fonts_ubuntu.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>Ubuntu-R.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>YuGothR.ttc</file>
diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp
index c3b25270d2..193ab0d1a8 100644
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@@ -972,7 +972,21 @@ BOOL FSFloaterIM::postBuild()
 	mEmojiRecentIconsCtrl->setCommitCallback([this](LLUICtrl*, const LLSD& value) { onRecentEmojiPicked(value); });
 	mEmojiRecentIconsCtrl->setVisible(false);
 
+	static bool usePrettyEmojiButton = gSavedSettings.getBOOL( "FSUsePrettyEmojiButton" );
+	static bool useBWEmojis = gSavedSettings.getBOOL( "FSUseBWEmojis" );
 	mEmojiPickerToggleBtn = getChild<LLButton>("emoji_picker_toggle_btn");
+	if (usePrettyEmojiButton)
+	{
+		static auto emoji_btn_char = gSavedSettings.getU32("FSPrettyEmojiButtonCode");
+		mEmojiPickerToggleBtn->setImageOverlay(LLUUID::null);
+		mEmojiPickerToggleBtn->setFont(LLFontGL::getFontEmoji(useBWEmojis));
+		mEmojiPickerToggleBtn->setLabel(LLUIString(LLWString(1, emoji_btn_char)));
+	}
+	else
+	{
+		mEmojiPickerToggleBtn->setLabel(LLUIString(""));
+		mEmojiPickerToggleBtn->setImageOverlay("Emoji_Picker_Icon");
+	}
 	mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); });
 
 	mRecentEmojisUpdatedCallbackConnection = LLFloaterEmojiPicker::setRecentEmojisUpdatedCallback([this](const std::list<llwchar>& recent_emojis_list) { initEmojiRecentPanel(); });
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index b2922e5f57..34f66d2850 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -161,7 +161,21 @@ BOOL FSFloaterNearbyChat::postBuild()
 	mEmojiRecentIconsCtrl->setCommitCallback([this](LLUICtrl*, const LLSD& value) { onRecentEmojiPicked(value); });
 	mEmojiRecentIconsCtrl->setVisible(false);
 
+	static bool usePrettyEmojiButton = gSavedSettings.getBOOL( "FSUsePrettyEmojiButton" );
+	static bool useBWEmojis = gSavedSettings.getBOOL( "FSUseBWEmojis" );
 	mEmojiPickerToggleBtn = getChild<LLButton>("emoji_picker_toggle_btn");
+	if (usePrettyEmojiButton)
+	{
+		static auto emoji_btn_char = gSavedSettings.getU32("FSPrettyEmojiButtonCode");
+		mEmojiPickerToggleBtn->setImageOverlay(LLUUID::null);
+		mEmojiPickerToggleBtn->setFont(LLFontGL::getFontEmoji(useBWEmojis));
+		mEmojiPickerToggleBtn->setLabel(LLUIString(LLWString(1, emoji_btn_char)));
+	}
+	else
+	{
+		mEmojiPickerToggleBtn->setLabel(LLUIString(""));
+		mEmojiPickerToggleBtn->setImageOverlay("Emoji_Picker_Icon");
+	}
 	mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); });
 
 	mRecentEmojisUpdatedCallbackConnection = LLFloaterEmojiPicker::setRecentEmojisUpdatedCallback([this](const std::list<llwchar>& recent_emojis_list) { initEmojiRecentPanel(); });
diff --git a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
index 1d81dca1b6..252d7e317d 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
@@ -655,27 +655,27 @@
               auto_resize="false"
               user_resize="false"
               name="emoji_button_layout_panel"
-              width="35"
-              top="0"
-              bottom="-1">
+              width="37">
               <button
                follows="right|bottom"
-               bottom="23"
-               height="22"
+               bottom="-1"
+               height="24"
+               width="27"
+               font="EmojiBWLarge"
                use_font_color="true"
-               font="EmojiLarge"
                image_hover_unselected="Toolbar_Middle_Over"
                image_selected="Toolbar_Middle_Selected"
                image_unselected="Toolbar_Middle_Off"
                image_overlay="Emoji_Picker_Icon"
-               right="-11"
+               label=""
+               left="0"
                name="emoji_picker_toggle_btn"
                tool_tip="Show emoji panel"
-               width="24"/>
+              />
               <button
                follows="right|bottom"
-               bottom="23"
-               height="22"
+               bottom="-1"
+               height="24"
                use_font_color="true"
                font="EmojiLarge"
                image_hover_unselected="Toolbar_Middle_Over"
diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
index 7a273af34c..e679091fe2 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
@@ -276,24 +276,26 @@
               auto_resize="false"
               user_resize="false"
               name="emoji_button_layout_panel"
-              width="35">
+              width="37">
               <button
                follows="right|bottom"
                bottom="-1"
-               height="22"
-               font="EmojiLarge"
+               height="24"
+               width ="27"
+               font="EmojiBWLarge"
                image_hover_unselected="Toolbar_Middle_Over"
                image_selected="Toolbar_Middle_Selected"
                image_unselected="Toolbar_Middle_Off"
                image_overlay="Emoji_Picker_Icon"
-               right="-11"
+               label=""
+               left="0"
                name="emoji_picker_toggle_btn"
                tool_tip="Show emoji panel"
-               width="24"/>
+              />
               <button
                follows="right|bottom"
                bottom="-1"
-               height="22"
+               height="24"
                use_font_color="true"
                font="EmojiLarge"
                image_hover_unselected="Toolbar_Middle_Over"
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 4b8d044063..7e6ef91b92 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -3,7 +3,8 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSans.ttf</file>
-    <file functor="is_emoji">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_color">TwemojiSVG.ttf</file>
+    <file functor="is_emoji_use_bw">NotoEmoji-Regular.ttf</file>
     <os name="Windows">
       <file>MSNeoGothic.ttf</file>
       <file>meiryo.TTC</file>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index 992f19375a..25eedfc766 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -1812,7 +1812,7 @@ Default 0. Larger values may not work well.
          follows="left|top"
          name="emoji_font_settings_label"
          width="120">
-          Emoji Font Settings:
+          Emoji Font Settings: (restart required for full effect)
         </text>
         <check_box
         control_name="FSUseBWEmojis"
@@ -1907,4 +1907,3 @@ Default 0. Larger values may not work well.
     </panel>
 </tab_container>
 </panel>
-

From dcde02f97fbfa92f063ea75522bd968b7ed8b6d6 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 10 Mar 2024 03:18:27 +0000
Subject: [PATCH 26/38] Fix the autobuild.xml ready for upload of new package

---
 autobuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autobuild.xml b/autobuild.xml
index 55165acdff..6e5673d970 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3442,7 +3442,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>file:///D:\src\3p-viewer-fonts\viewer_fonts-1.240681616-common-240681616.tar.bz2</string>
+              <string>https://3p.firestormviewer.org/viewer_fonts-1.240681616-common-240681616.tar.bz2</string>
             </map>
             <key>name</key>
             <string>common</string>

From 470c607b052b824249ddb835412d779904743323 Mon Sep 17 00:00:00 2001
From: Pork Chop <mygoditsfullofstars@phoenixviewer.com>
Date: Sun, 10 Mar 2024 18:06:44 +1100
Subject: [PATCH 27/38] Linux: Update the bundled libfreetype with one that has
 the bz2 dependency dropped from it - it shouldnbt be needed anyway in most
 cases

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

diff --git a/autobuild.xml b/autobuild.xml
index 6e5673d970..bc79491d97 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1122,11 +1122,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>bf2d2e4350caaea2b2fb6116d05548c80f402f81</string>
+              <string>a8326f592bf608095f0854383eec2baf36257ea9</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/freetype-2.12.1.240620850-linux64-240620850.tar.zst</string>
+              <string>https://3p.firestormviewer.org/freetype-2.12.1.240700637-linux64-240700637.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>

From 9d0b91fed7149609d277397f483e9186ba20d8f4 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 10 Mar 2024 15:53:10 +0100
Subject: [PATCH 28/38] Undo the reordering of autobuild.xml

---
 autobuild.xml                          | 1084 +++++++++++++-----------
 indra/newview/llfloateremojipicker.cpp |    4 +-
 2 files changed, 570 insertions(+), 518 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index bc79491d97..ec47c4bbf4 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -9,6 +9,16 @@
     <map>
       <key>SDL2</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1997-2023 Sam Lantinga</string>
+        <key>description</key>
+        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
+        <key>license</key>
+        <string>zlib</string>
+        <key>license_file</key>
+        <string>LICENSES/SDL.txt</string>
+        <key>name</key>
+        <string>SDL2</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -26,21 +36,19 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>zlib</string>
-        <key>license_file</key>
-        <string>LICENSES/SDL.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1997-2023 Sam Lantinga</string>
         <key>version</key>
         <string>2.24.1</string>
-        <key>name</key>
-        <string>SDL2</string>
-        <key>description</key>
-        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
       </map>
       <key>gstreamer10</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/gstreamer.txt</string>
+        <key>name</key>
+        <string>gstreamer10</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -56,19 +64,19 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/gstreamer.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
         <key>version</key>
         <string>0.10.6.294903</string>
-        <key>name</key>
-        <string>gstreamer10</string>
       </map>
       <key>breakpad</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) google</string>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/google_breakpad.txt</string>
+        <key>name</key>
+        <string>breakpad</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -84,19 +92,19 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/google_breakpad.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) google</string>
         <key>version</key>
         <string>2.48.0</string>
-        <key>name</key>
-        <string>breakpad</string>
       </map>
       <key>glib</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) glib project</string>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/glib.txt</string>
+        <key>name</key>
+        <string>glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -114,19 +122,19 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/glib.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) glib project</string>
         <key>version</key>
         <string>2.48.0</string>
-        <key>name</key>
-        <string>glib</string>
       </map>
       <key>fltk</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) fltk project</string>
+        <key>license</key>
+        <string>LGPL/fltk</string>
+        <key>license_file</key>
+        <string>LICENSES/fltk.txt</string>
+        <key>name</key>
+        <string>fltk</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -142,19 +150,21 @@
             <string>linux</string>
           </map>
         </map>
-        <key>license</key>
-        <string>LGPL/fltk</string>
-        <key>license_file</key>
-        <string>LICENSES/fltk.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) fltk project</string>
         <key>version</key>
         <string>1.3.5</string>
-        <key>name</key>
-        <string>fltk</string>
       </map>
       <key>jemalloc</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2002-present Jason Evans jasone@canonware.com.</string>
+        <key>description</key>
+        <string>jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support.</string>
+        <key>license</key>
+        <string>jemalloc (BSD derived)</string>
+        <key>license_file</key>
+        <string>LICENSES/jemalloc.txt</string>
+        <key>name</key>
+        <string>jemalloc</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -170,21 +180,17 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>jemalloc (BSD derived)</string>
-        <key>license_file</key>
-        <string>LICENSES/jemalloc.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2002-present Jason Evans jasone@canonware.com.</string>
         <key>version</key>
         <string>5.1.0</string>
-        <key>name</key>
-        <string>jemalloc</string>
-        <key>description</key>
-        <string>jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support.</string>
       </map>
       <key>ndPhysicsStub</key>
       <map>
+        <key>license</key>
+        <string>HACD/LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/ndPhysicsStub.txt</string>
+        <key>name</key>
+        <string>ndPhysicsStub</string>
         <key>platforms</key>
         <map>
           <key>darwin</key>
@@ -224,15 +230,17 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>HACD/LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/ndPhysicsStub.txt</string>
-        <key>name</key>
-        <string>ndPhysicsStub</string>
       </map>
       <key>glod</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2003 Jonathan Cohen, Nat Duca, David Luebke, Brenden Schubert - Johns Hopkins University and University of Virginia</string>
+        <key>license</key>
+        <string>GLOD Open-Source License   Version 1.0</string>
+        <key>license_file</key>
+        <string>LICENSES/GLOD.txt</string>
+        <key>name</key>
+        <string>glod</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -272,19 +280,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>GLOD Open-Source License   Version 1.0</string>
-        <key>license_file</key>
-        <string>LICENSES/GLOD.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2003 Jonathan Cohen, Nat Duca, David Luebke, Brenden Schubert - Johns Hopkins University and University of Virginia</string>
         <key>version</key>
         <string>1.0pre3.532346</string>
-        <key>name</key>
-        <string>glod</string>
       </map>
       <key>gntp-growl</key>
       <map>
+        <key>copyright</key>
+        <string>The Growl Project</string>
+        <key>description</key>
+        <string>A unified notification system for Mac OS X</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>name</key>
+        <string>gntp-growl</string>
         <key>platforms</key>
         <map>
           <key>darwin</key>
@@ -324,17 +332,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>copyright</key>
-        <string>The Growl Project</string>
-        <key>name</key>
-        <string>gntp-growl</string>
-        <key>description</key>
-        <string>A unified notification system for Mac OS X</string>
       </map>
       <key>discord-rpc</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2019 Discord, Inc.</string>
+        <key>description</key>
+        <string>C++ library to interface with Discord's API</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/discord-rpc.txt</string>
+        <key>name</key>
+        <string>discord-rpc</string>
         <key>platforms</key>
         <map>
           <key>windows64</key>
@@ -374,16 +384,6 @@
             <string>darwin64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/discord-rpc.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2019 Discord, Inc.</string>
-        <key>name</key>
-        <string>discord-rpc</string>
-        <key>description</key>
-        <string>C++ library to interface with Discord's API</string>
       </map>
       <key>SDL</key>
       <map>
@@ -415,56 +415,6 @@
         <key>description</key>
         <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
       </map>
-      <key>tracy</key>
-      <map>
-        <key>platforms</key>
-        <map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>9b6e1a1f4b0969d38a1ca8ee00aeb548</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110584/960613/tracy-v0.8.1.578241-darwin64-578241.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
-          <key>windows64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>05b72ae5d733aed7d3bf142287601cc6</string>
-              <key>hash_algorithm</key>
-              <string>md5</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110586/960637/tracy-v0.8.1.578241-windows64-578241.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows64</string>
-          </map>
-        </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tracy_license.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
-        <key>version</key>
-        <string>v0.8.1.578241</string>
-        <key>name</key>
-        <string>tracy</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
-        <key>description</key>
-        <string>Tracy Profiler Library</string>
-        <key>source</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
-        <key>source_type</key>
-        <string>git</string>
-      </map>
       <key>apr_suite</key>
       <map>
         <key>platforms</key>
@@ -895,6 +845,18 @@
       </map>
       <key>emoji_shortcodes</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://github.com/secondlife/3p-emoji-shortcodes</string>
+        <key>copyright</key>
+        <string>Copyright 2017-2019 Miles Johnson.</string>
+        <key>description</key>
+        <string>Emoji shortcodes</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/emojibase-license.txt</string>
+        <key>name</key>
+        <string>emoji_shortcodes</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -936,20 +898,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/emojibase-license.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2017-2019 Miles Johnson.</string>
         <key>version</key>
         <string>6.1.0.579438</string>
-        <key>name</key>
-        <string>emoji_shortcodes</string>
-        <key>canonical_repo</key>
-        <string>https://github.com/secondlife/3p-emoji-shortcodes</string>
-        <key>description</key>
-        <string>Emoji shortcodes</string>
       </map>
       <key>expat</key>
       <map>
@@ -1101,6 +1051,16 @@
       </map>
       <key>freetype</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
+        <key>description</key>
+        <string>Font rendering library</string>
+        <key>license</key>
+        <string>FreeType</string>
+        <key>license_file</key>
+        <string>LICENSES/freetype.txt</string>
+        <key>name</key>
+        <string>freetype</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1146,18 +1106,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>FreeType</string>
-        <key>license_file</key>
-        <string>LICENSES/freetype.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
         <key>version</key>
         <string>2.12.1.557becd</string>
-        <key>name</key>
-        <string>freetype</string>
-        <key>description</key>
-        <string>Font rendering library</string>
       </map>
       <key>glext</key>
       <map>
@@ -1373,6 +1323,18 @@
       </map>
       <key>icu4c</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-icu4c</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1995-2011 International Business Machines Corporation and others &lt;http://source.icu-project.org&gt;</string>
+        <key>description</key>
+        <string>ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software.</string>
+        <key>license</key>
+        <string>ICU, permissive non-copyleft free software license</string>
+        <key>license_file</key>
+        <string>LICENSES/icu.txt</string>
+        <key>name</key>
+        <string>icu4c</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1418,20 +1380,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>ICU, permissive non-copyleft free software license</string>
-        <key>license_file</key>
-        <string>LICENSES/icu.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1995-2011 International Business Machines Corporation and others &lt;http://source.icu-project.org&gt;</string>
         <key>version</key>
         <string>4.8.1-7d08d82</string>
-        <key>name</key>
-        <string>icu4c</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-icu4c</string>
-        <key>description</key>
-        <string>ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software.</string>
       </map>
       <key>jpegencoderbasic</key>
       <map>
@@ -2230,6 +2180,18 @@
       </map>
       <key>mikktspace</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-mikktspace</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
+        <key>description</key>
+        <string>Mikktspace Tangent Generator</string>
+        <key>license</key>
+        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
+        <key>license_file</key>
+        <string>mikktspace.txt</string>
+        <key>name</key>
+        <string>mikktspace</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2281,20 +2243,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
-        <key>license_file</key>
-        <string>mikktspace.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
         <key>version</key>
         <string>1</string>
-        <key>name</key>
-        <string>mikktspace</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-mikktspace</string>
-        <key>description</key>
-        <string>Mikktspace Tangent Generator</string>
       </map>
       <key>minizip-ng</key>
       <map>
@@ -2360,6 +2310,18 @@
       </map>
       <key>nanosvg</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-nanosvg</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2013-14 Mikko Mononen</string>
+        <key>description</key>
+        <string>NanoSVG is a simple single-header-file SVG parser and rasterizer</string>
+        <key>license</key>
+        <string>Zlib</string>
+        <key>license_file</key>
+        <string>LICENSES/nanosvg.txt</string>
+        <key>name</key>
+        <string>nanosvg</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2399,20 +2361,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Zlib</string>
-        <key>license_file</key>
-        <string>LICENSES/nanosvg.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2013-14 Mikko Mononen</string>
         <key>version</key>
         <string>2022.09.27</string>
-        <key>name</key>
-        <string>nanosvg</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-nanosvg</string>
-        <key>description</key>
-        <string>NanoSVG is a simple single-header-file SVG parser and rasterizer</string>
       </map>
       <key>nghttp2</key>
       <map>
@@ -2569,6 +2519,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>open-libndofdev</key>
       <map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/libndofdev.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
+        <key>version</key>
+        <string>0.3</string>
+        <key>name</key>
+        <string>open-libndofdev</string>
+        <key>description</key>
+        <string>Open Source replacement for 3DConnection SDK</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -2586,18 +2548,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/libndofdev.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
         <key>version</key>
         <string>0.13.222872202</string>
-        <key>name</key>
-        <string>open-libndofdev</string>
-        <key>description</key>
-        <string>Open Source replacement for 3DConnection SDK</string>
       </map>
       <key>openal</key>
       <map>
@@ -2947,6 +2899,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tinygltf</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
+        <key>copyright</key>
+        <string>// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many contributors.</string>
+        <key>description</key>
+        <string>tinygltf import library</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/tinygltf_license.txt</string>
+        <key>name</key>
+        <string>tinygltf</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2962,24 +2926,64 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/tinygltf_license.txt</string>
-        <key>copyright</key>
-        <string>// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many contributors.</string>
-        <key>version</key>
-        <string>v2.5.0</string>
-        <key>name</key>
-        <string>tinygltf</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
-        <key>description</key>
-        <string>tinygltf import library</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
         <key>source_type</key>
         <string>git</string>
+        <key>version</key>
+        <string>v2.5.0</string>
+      </map>
+      <key>tracy</key>
+      <map>
+        <key>platforms</key>
+        <map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>9b6e1a1f4b0969d38a1ca8ee00aeb548</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110584/960613/tracy-v0.8.1.578241-darwin64-578241.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin64</string>
+          </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>05b72ae5d733aed7d3bf142287601cc6</string>
+              <key>hash_algorithm</key>
+              <string>md5</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110586/960637/tracy-v0.8.1.578241-windows64-578241.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+        </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tracy_license.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
+        <key>version</key>
+        <string>v0.8.1.235e98f</string>
+        <key>name</key>
+        <string>tracy</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
+        <key>description</key>
+        <string>Tracy Profiler Library</string>
+        <key>source</key>
+        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
+        <key>source_type</key>
+        <string>git</string>
+        <key>version</key>
+        <string>v0.8.1.578241</string>
       </map>
       <key>tut</key>
       <map>
@@ -3071,6 +3075,60 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>description</key>
         <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
       </map>
+      <key>viewer-fonts</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT, Copyright 2016-2022 Twitter, Inc. CC-BY-4.0, Copyright 2013 Joe Loughry and Terence Eden MIT</string>
+        <key>description</key>
+        <string>Viewer fonts</string>
+        <key>license</key>
+        <string>Various open source</string>
+        <key>license_file</key>
+        <string>LICENSES/fonts.txt</string>
+        <key>name</key>
+        <string>viewer-fonts</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>deb47841d8e6c82fe9704aaa79d62846</string>
+              <key>url</key>
+              <string>https://3p.firestormviewer.org/viewer_fonts-1.240681616-common-240681616.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin64</string>
+          </map>
+          <key>linux64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>deb47841d8e6c82fe9704aaa79d62846</string>
+              <key>url</key>
+              <string>https://3p.firestormviewer.org/viewer_fonts-1.240681616-common-240681616.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux64</string>
+          </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>deb47841d8e6c82fe9704aaa79d62846</string>
+              <key>url</key>
+              <string>https://3p.firestormviewer.org/viewer_fonts-1.240681616-common-240681616.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+        </map>
+        <key>version</key>
+        <string>1.579464</string>
+      </map>
       <key>viewer-manager</key>
       <map>
         <key>platforms</key>
@@ -3241,6 +3299,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>vulkan_gltf</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
+        <key>description</key>
+        <string>Vulkan GLTF Sample Implementation</string>
+        <key>license</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
+        <key>license_file</key>
+        <string>LICENSES/vulkan_gltf.txt</string>
+        <key>name</key>
+        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -3280,20 +3350,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>license_file</key>
-        <string>LICENSES/vulkan_gltf.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
         <key>version</key>
         <string>1</string>
-        <key>name</key>
-        <string>vulkan_gltf</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
-        <key>description</key>
-        <string>Vulkan GLTF Sample Implementation</string>
       </map>
       <key>xxhash</key>
       <map>
@@ -3429,40 +3487,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>description</key>
         <string>zlib data compression library for the next generation systems</string>
       </map>
-      <key>viewer-fonts</key>
-      <map>
-        <key>platforms</key>
-        <map>
-          <key>common</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>deb47841d8e6c82fe9704aaa79d62846</string>
-              <key>hash_algorithm</key>
-              <string>md5</string>
-              <key>url</key>
-              <string>https://3p.firestormviewer.org/viewer_fonts-1.240681616-common-240681616.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>common</string>
-          </map>
-        </map>
-        <key>license</key>
-        <string>Various open source</string>
-        <key>license_file</key>
-        <string>LICENSES/fonts.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT, Copyright 2016-2022 Twitter, Inc. CC-BY-4.0, Copyright 2013 Joe Loughry and Terence Eden MIT</string>
-        <key>version</key>
-        <string>1.240681616</string>
-        <key>name</key>
-        <string>viewer-fonts</string>
-        <key>canonical_repo</key>
-        <string>https://github.com/secondlife/3p-viewer-fonts</string>
-        <key>description</key>
-        <string>Viewer fonts</string>
-      </map>
     </map>
     <key>package_description</key>
     <map>
@@ -3484,7 +3508,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3504,11 +3528,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -3525,7 +3549,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3545,29 +3569,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
             <key>ReleaseFS</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--config</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3578,26 +3590,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--build</string>
                   <string>--version</string>
                   <string>--opensim</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--config</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseFS</string>
             </map>
             <key>ReleaseFS_AVX</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--config</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-                  <string>--avx</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3609,26 +3620,26 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--version</string>
                   <string>--opensim</string>
                   <string>--avx</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--config</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+                  <string>--avx</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseFS_AVX</string>
             </map>
             <key>ReleaseFS_AVX2</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--config</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-                  <string>--avx2</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3640,25 +3651,26 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--version</string>
                   <string>--opensim</string>
                   <string>--avx2</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--config</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+                  <string>--avx2</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseFS_AVX2</string>
             </map>
             <key>ReleaseFS_open</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--config</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3669,26 +3681,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--build</string>
                   <string>--version</string>
                   <string>--opensim</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--config</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseFS_open</string>
             </map>
             <key>RelWithDebInfoFS</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--btype RelWithDebInfo</string>
-                  <string>--config</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3700,26 +3711,26 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--build</string>
                   <string>--version</string>
                   <string>--opensim</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--btype RelWithDebInfo</string>
+                  <string>--config</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS</string>
             </map>
             <key>RelWithDebInfoFS_open</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>command</key>
-                <string>bash</string>
-                <key>options</key>
-                <array>
-                  <string>../scripts/configure_firestorm.sh</string>
-                  <string>--btype RelWithDebInfo</string>
-                  <string>--config</string>
-                  <string>--version</string>
-                  <string>--opensim</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3731,7 +3742,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--build</string>
                   <string>--version</string>
                   <string>--opensim</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>command</key>
+                <string>bash</string>
+                <key>options</key>
+                <array>
+                  <string>../scripts/configure_firestorm.sh</string>
+                  <string>--btype RelWithDebInfo</string>
+                  <string>--config</string>
+                  <string>--version</string>
+                  <string>--opensim</string>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS_open</string>
@@ -3752,11 +3776,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3769,8 +3793,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
+              <!-- FS:Ansariel: This will cause packages being installed twice
+              <key>default</key>
+              <string>True</string>
+              -->
               <key>name</key>
               <string>RelWithDebInfo</string>
             </map>
@@ -3782,7 +3810,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3795,7 +3823,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -3804,15 +3832,19 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3825,7 +3857,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>Release</string>
@@ -3838,7 +3870,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3851,23 +3883,13 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
             <key>RelWithDebInfoFS</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform darwin</string>
-                  <string>--package</string>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
@@ -3876,43 +3898,48 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--platform darwin</string>
                   <string>--fmodstudio</string>
                   <string>--kdu</string>
-</array>
+                </array>
               </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform darwin</string>
+                  <string>--package</string>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+                </array>
+              </map>
+              <!-- FS:Ansariel: This will cause packages being installed twice
+              <key>default</key>
+              <string>True</string>
+              -->
               <key>name</key>
               <string>RelWithDebInfoFS</string>
             </map>
             <key>RelWithDebInfoFS_open</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform darwin</string>
-                  <string>--package</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--package</string>
                   <string>--platform darwin</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform darwin</string>
+                  <string>--package</string>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS_open</string>
             </map>
             <key>ReleaseFS</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform darwin</string>
-                  <string>--kdu</string>
-                  <string>--fmodstudio</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
@@ -3920,28 +3947,37 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--platform darwin</string>
                   <string>--fmodstudio</string>
                   <string>--kdu</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform darwin</string>
+                  <string>--kdu</string>
+                  <string>--fmodstudio</string>
+                </array>
               </map>
               <key>default</key>
               <string>True</string>
               <key>name</key>
               <string>ReleaseFS</string>
             </map>
-            <key>ReleaseFS_open</key>
+             <key>ReleaseFS_open</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform darwin</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--platform darwin</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform darwin</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseFS_open</string>
@@ -3965,17 +4001,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
                 <key>command</key>
                 <string>ninja</string>
               </map>
+              <!-- FS:Ansariel: This will cause packages being installed twice
+              <key>default</key>
+              <string>True</string>
+              -->
               <key>name</key>
               <string>Release</string>
             </map>
@@ -3988,7 +4028,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -4008,6 +4048,14 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>RelWithDebInfoFS</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform linux</string>
+                  <string>--package</string>
+                </array>
+              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4016,42 +4064,46 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--fmodstudio</string>
                   <string>--platform linux</string>
                   <string>--package</string>
-</array>
+                </array>
               </map>
+              <!-- FS:Ansariel: This will cause packages being installed twice
+              <key>default</key>
+              <string>True</string>
+              -->
+              <key>name</key>
+              <string>RelWithDebInfoFS</string>
+            </map>
+            <key>RelWithDebInfoFS_open</key>
+            <map>
               <key>build</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--platform linux</string>
                   <string>--package</string>
-</array>
+                </array>
               </map>
-              <key>name</key>
-              <string>RelWithDebInfoFS</string>
-            </map>
-            <key>RelWithDebInfoFS_open</key>
-            <map>
               <key>configure</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--platform linux</string>
                   <string>--package</string>
-</array>
-              </map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform linux</string>
-                  <string>--package</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS_open</string>
             </map>
             <key>ReleaseFS</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--build</string>
+                  <string>--platform linux</string>
+                </array>
+              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -4059,15 +4111,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--fmodstudio</string>
                   <string>--platform linux</string>
-</array>
-              </map>
-              <key>build</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--build</string>
-                  <string>--platform linux</string>
-</array>
+                </array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -4076,14 +4120,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>ReleaseFS_open</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--platform linux</string>
-                  <string>--package</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
@@ -4091,7 +4127,15 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--build</string>
                   <string>--platform linux</string>
                   <string>--package</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--platform linux</string>
+                  <string>--package</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseFS_open</string>
@@ -4116,11 +4160,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -4130,12 +4174,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>/build</string>
                   <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
+              <!-- FS:Ansariel: This will cause packages being installed twice
+              <key>default</key>
+              <string>True</string>
+              -->
               <key>name</key>
               <string>RelWithDebInfo</string>
             </map>
@@ -4152,11 +4200,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DUSE_OPENAL:BOOL=ON</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -4170,11 +4218,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -4189,11 +4237,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -4203,11 +4251,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>/build</string>
                   <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>Release</string>
@@ -4226,11 +4274,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DUSE_OPENAL:BOOL=ON</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -4244,27 +4292,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
             <key>RelWithDebInfoFS</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
@@ -4273,22 +4311,27 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--version</string>
                   <string>--platform windows</string>
-</array>
+                </array>
               </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+                </array>
+              </map>
+              <!-- FS:Ansariel: This will cause packages being installed twice
+              <key>default</key>
+              <string>True</string>
+              -->
               <key>name</key>
               <string>RelWithDebInfoFS</string>
             </map>
             <key>RelWithDebInfoFS_open</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--version</string>
-                  <string>--btype RelWithDebInfo</string>
-                  <string>--platform windows</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
@@ -4296,23 +4339,22 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--version</string>
                   <string>--btype RelWithDebInfo</string>
                   <string>--platform windows</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--version</string>
+                  <string>--btype RelWithDebInfo</string>
+                  <string>--platform windows</string>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoFS_open</string>
             </map>
             <key>ReleaseFS</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
@@ -4321,7 +4363,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--version</string>
                   <string>--platform windows</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+                </array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -4330,16 +4382,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>ReleaseFS_AVX</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
@@ -4348,23 +4390,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--version</string>
                   <string>--platform windows</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseFS_AVX</string>
             </map>
             <key>ReleaseFS_AVX2</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--fmodstudio</string>
-                  <string>--kdu</string>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
@@ -4373,28 +4415,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>--kdu</string>
                   <string>--version</string>
                   <string>--platform windows</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--fmodstudio</string>
+                  <string>--kdu</string>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseFS_AVX2</string>
             </map>
             <key>ReleaseFS_open</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>--version</string>
-                  <string>--platform windows</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>--version</string>
                   <string>--platform windows</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>--version</string>
+                  <string>--platform windows</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseFS_open</string>
@@ -4422,4 +4474,4 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       <string>Firestorm Viewer</string>
     </map>
   </map>
-</llsd>
\ No newline at end of file
+</llsd>
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 3e32885047..3b06b0f4f2 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -143,8 +143,8 @@ public:
         F32 x = getRect().getWidth() / 2;
         F32 y = getRect().getHeight() / 2;
         // <FS:Beq> Add B&W emoji font support
-        // LLFontGL::getFontEmoji( useBWEmojis )->render( 
-        LLFontGL::getFontEmoji( useBWEmojis )->render( 
+        // LLFontGL::getFontEmoji()->render( 
+        LLFontGL::getFontEmoji(useBWEmojis)->render( 
         // </FS:Beq>
             mText,                      // wstr
             0,                          // begin_offset

From e1e3a0657a7c8590835c68fff2fa4c39c298a0dc Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 10 Mar 2024 15:59:07 +0100
Subject: [PATCH 29/38] Update German translation

---
 indra/newview/skins/default/xui/de/panel_preferences_UI.xml | 5 +++++
 indra/newview/skins/default/xui/en/panel_preferences_UI.xml | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml
index a16ac75c63..a48322e3d1 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml
@@ -285,6 +285,11 @@ Standard 0. Größere Werte können nicht korrekt funktionieren.
 			<combo_item name="Medium" label="Mittel"/>
 			<combo_item name="Large" label="Groß"/>
 		</combo_box>
+		<text name="emoji_font_settings_label">
+			Emoji-Schrifteinstellungen: (erfordert Neustart)
+		</text>
+		<check_box label="Emojis in monochrom darstellen" name="FSUseBWEmojis"/>
+		<check_box label="Hübschen Emoji-Button verwenden" name="FSUsePrettyEmojiButton"/>
 	</panel>
 </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index 25eedfc766..1ac1e70855 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -1811,13 +1811,13 @@ Default 0. Larger values may not work well.
          left="10"
          follows="left|top"
          name="emoji_font_settings_label"
-         width="120">
+         width="300">
           Emoji Font Settings: (restart required for full effect)
         </text>
         <check_box
         control_name="FSUseBWEmojis"
         height="16"
-        label="Display emojis in monochrome:"
+        label="Display emojis in monochrome"
         layout="topleft"
         left="15"
         name="FSUseBWEmojis"
@@ -1826,7 +1826,7 @@ Default 0. Larger values may not work well.
         <check_box
         control_name="FSUsePrettyEmojiButton"
         height="16"
-        label="Use pretty Emoji button:"
+        label="Use pretty Emoji button"
         layout="topleft"
         left="15"
         name="FSUsePrettyEmojiButton"

From 1c6cabb42407f2bb567b22076b732485a3bbb069 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 10 Mar 2024 14:59:28 +0000
Subject: [PATCH 30/38] Don't mark the definitions as static

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

diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 7e5f215a76..e20621965e 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -50,7 +50,8 @@ const std::string MACOSX_FONT_SUPPLEMENTAL = "Supplemental/";
 
 
 // <FS:Beq> font functors with UI control access
-static bool isEmojiUseBW(llwchar wch)
+//static 
+bool isEmojiUseBW(llwchar wch)
 {
 	static LLCachedControl<bool> emoji_use_bw(gSavedSettings, "FSUseEmojiBW", false);
 	if(emoji_use_bw)
@@ -62,7 +63,7 @@ static bool isEmojiUseBW(llwchar wch)
 
 
 // static
-static bool isEmojiUseColor(llwchar wch)
+bool isEmojiUseColor(llwchar wch)
 {
 	static LLCachedControl<bool> emoji_use_bw(gSavedSettings, "FSUseEmojiBW", false);
 	if(!emoji_use_bw)

From 100325911200ce405a742f044cbf86707f3be936 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 10 Mar 2024 16:16:58 +0100
Subject: [PATCH 31/38] Use colorful emojis as default

---
 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 0213ca17d7..abdd95cc90 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -26768,7 +26768,7 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>FSUsePrettyEmojiButton</key>
     <map>

From 9df3bc2e08d1c5dca8419eb6508f342524777d8c Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 10 Mar 2024 16:18:51 +0100
Subject: [PATCH 32/38] Pretty emojis is dependent on emojis getting displayed
 in color

---
 indra/newview/skins/default/xui/en/panel_preferences_UI.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index 1ac1e70855..7019b57a72 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -1824,6 +1824,7 @@ Default 0. Larger values may not work well.
         top_pad="13"
         width="215" />
         <check_box
+        disabled_control="FSUseBWEmojis"
         control_name="FSUsePrettyEmojiButton"
         height="16"
         label="Use pretty Emoji button"

From eb9872aa0f440ab183484b040e5632f9ef30336e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 10 Mar 2024 16:25:20 +0100
Subject: [PATCH 33/38] Get rid of static method declarations in header since
 they are only used in the cpp translation unit

---
 indra/llrender/llfontregistry.cpp | 7 +++----
 indra/llrender/llfontregistry.h   | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index e20621965e..5773aeafdc 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -50,8 +50,7 @@ const std::string MACOSX_FONT_SUPPLEMENTAL = "Supplemental/";
 
 
 // <FS:Beq> font functors with UI control access
-//static 
-bool isEmojiUseBW(llwchar wch)
+static bool isEmojiUseBW(llwchar wch)
 {
 	static LLCachedControl<bool> emoji_use_bw(gSavedSettings, "FSUseEmojiBW", false);
 	if(emoji_use_bw)
@@ -62,8 +61,7 @@ bool isEmojiUseBW(llwchar wch)
 }
 
 
-// static
-bool isEmojiUseColor(llwchar wch)
+static bool isEmojiUseColor(llwchar wch)
 {
 	static LLCachedControl<bool> emoji_use_bw(gSavedSettings, "FSUseEmojiBW", false);
 	if(!emoji_use_bw)
@@ -73,6 +71,7 @@ bool isEmojiUseColor(llwchar wch)
 	return false;
 }
 // </FS:Beq>
+
 LLFontDescriptor::char_functor_map_t LLFontDescriptor::mCharFunctors({
 	{ "is_emoji", LLStringOps::isEmoji }
 	, { "is_emoji_use_color", isEmojiUseColor }
diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h
index 4746348b41..4d8c9ed544 100644
--- a/indra/llrender/llfontregistry.h
+++ b/indra/llrender/llfontregistry.h
@@ -34,10 +34,6 @@ class LLFontGL;
 
 typedef std::vector<std::string> string_vec_t;
 
-// <FS:Beq> preference aware font functors
-static bool isEmojiUseBW(llwchar wch);
-static bool isEmojiUseColor(llwchar wch);
-// </FS:Beq>
 struct LLFontFileInfo
 {
 	LLFontFileInfo(const std::string& file_name, const std::function<bool(llwchar)>& char_functor = nullptr)

From cfdca912193fb66d50f8d9aa174815cadae16339 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 10 Mar 2024 19:18:39 +0100
Subject: [PATCH 34/38] FIRE-33750, FIRE-33746 Updated French (Laurent Bechir),
 Russian (Romka Swallowtail) and Polish translations

---
 .../default/xui/fr/floater_emoji_picker.xml   |  8 +++
 .../default/xui/fr/floater_fs_im_session.xml  | 65 +++++++++++++++----
 .../default/xui/fr/floater_fs_nearby_chat.xml | 13 +++-
 .../default/xui/fr/floater_im_session.xml     | 13 +++-
 .../default/xui/fr/menu_fs_chat_options.xml   |  1 +
 .../skins/default/xui/fr/menu_login.xml       |  5 ++
 .../skins/default/xui/fr/menu_viewer.xml      |  3 +
 .../default/xui/fr/panel_preferences_chat.xml |  4 +-
 .../default/xui/pl/panel_preferences_UI.xml   |  5 ++
 .../default/xui/pl/panel_preferences_chat.xml |  6 +-
 .../default/xui/ru/floater_emoji_picker.xml   |  6 ++
 .../default/xui/ru/floater_fs_im_session.xml  | 12 +++-
 .../default/xui/ru/floater_fs_nearby_chat.xml |  7 ++
 .../default/xui/ru/floater_im_session.xml     |  7 +-
 .../default/xui/ru/menu_fs_chat_options.xml   |  1 +
 .../skins/default/xui/ru/menu_login.xml       |  5 ++
 .../skins/default/xui/ru/menu_viewer.xml      |  2 +
 .../default/xui/ru/panel_preferences_chat.xml |  2 +
 18 files changed, 142 insertions(+), 23 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/fr/floater_emoji_picker.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_emoji_picker.xml

diff --git a/indra/newview/skins/default/xui/fr/floater_emoji_picker.xml b/indra/newview/skins/default/xui/fr/floater_emoji_picker.xml
new file mode 100644
index 0000000000..cff1f19361
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_emoji_picker.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="emojipicker" title="Choisir un émoji">
+	<floater.string name="title_for_recently_used" value="Récemment utilisé"/>
+	<floater.string name="title_for_frequently_used" value="Souvent utilisé"/>
+	<text name="Dummy">
+		Aucun émoji sélectionné
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_fs_im_session.xml b/indra/newview/skins/default/xui/fr/floater_fs_im_session.xml
index f9e1296b9f..ded7046d91 100644
--- a/indra/newview/skins/default/xui/fr/floater_fs_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fs_im_session.xml
@@ -1,19 +1,45 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater show_title="true" name="panel_im">
 	<layout_stack name="ls_control_panel">
-		<layout_panel name="gprofile_panel"><button name="group_info_btn" tool_tip="Voir le profil de ce groupe"/></layout_panel>
-		<layout_panel name="profile_panel"><button name="view_profile_btn" tool_tip="Voir le profil de ce résident"/></layout_panel>
-		<layout_panel name="friend_panel"><button tool_tip="Devenir amis" name="add_friend_btn"/></layout_panel>
-		<layout_panel name="tp_panel"><menu_button name="teleport_btn" tool_tip="Offrir ou demander une téléportation"/></layout_panel>
-		<layout_panel name="share_panel"><button tool_tip="Envoyer un objet à ce résident" name="share_btn"/></layout_panel>
-		<layout_panel name="pay_panel"><button tool_tip="Envoyer de l'argent à ce résident" name="pay_btn"/></layout_panel>
-		<layout_panel name="call_btn_panel"><button tool_tip="Appel vocal" name="call_btn"/></layout_panel>
-		<layout_panel name="end_call_btn_panel"><button tool_tip="Raccrocher" name="end_call_btn"/></layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel"><button tool_tip="Propriétés Audio" name="voice_ctrls_btn"/></layout_panel>
-		<layout_panel name="im_history_btn_panel"><button tool_tip="Afficher les dernières transcriptions de cette conversation." name="im_history_btn"/></layout_panel>
-		<layout_panel name="add_participant_panel"><button tool_tip="Invitez quelqu'un à cette conversation" name="add_participant_btn"/></layout_panel>
-		<layout_panel name="send_sysinfo_btn_panel"><button tool_tip="Envoyez system info" name="send_sysinfo_btn"/></layout_panel>
-		<layout_panel name="lp_options_btn"><menu_button tool_tip="Options du Chat" name="chat_options_btn"/></layout_panel>
+		<layout_panel name="gprofile_panel">
+			<button name="group_info_btn" tool_tip="Voir le profil de ce groupe"/>
+		</layout_panel>
+		<layout_panel name="profile_panel">
+			<button name="view_profile_btn" tool_tip="Voir le profil de ce résident"/>
+		</layout_panel>
+		<layout_panel name="friend_panel">
+			<button tool_tip="Devenir amis" name="add_friend_btn"/>
+		</layout_panel>
+		<layout_panel name="tp_panel">
+			<menu_button name="teleport_btn" tool_tip="Offrir ou demander une téléportation"/>
+		</layout_panel>
+		<layout_panel name="share_panel">
+			<button tool_tip="Envoyer un objet à ce résident" name="share_btn"/>
+		</layout_panel>
+		<layout_panel name="pay_panel">
+			<button tool_tip="Envoyer de l'argent à ce résident" name="pay_btn"/>
+		</layout_panel>
+		<layout_panel name="call_btn_panel">
+			<button tool_tip="Appel vocal" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button tool_tip="Raccrocher" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button tool_tip="Propriétés Audio" name="voice_ctrls_btn"/>
+		</layout_panel>
+		<layout_panel name="im_history_btn_panel">
+			<button tool_tip="Afficher les dernières transcriptions de cette conversation." name="im_history_btn"/>
+		</layout_panel>
+		<layout_panel name="add_participant_panel">
+			<button tool_tip="Invitez quelqu'un à cette conversation" name="add_participant_btn"/>
+		</layout_panel>
+		<layout_panel name="send_sysinfo_btn_panel">
+			<button tool_tip="Envoyez system info" name="send_sysinfo_btn"/>
+		</layout_panel>
+		<layout_panel name="lp_options_btn">
+			<menu_button tool_tip="Options du Chat" name="chat_options_btn"/>
+		</layout_panel>
 		<layout_panel name="support_panel" width="135">
 			<icon name="dummy_icon_support_group" width="133"/>
 			<check_box label="Spécifier la version" name="FSSupportGroupChatPrefix_toggle" tool_tip="Indique la version de votre Viewer et son thème au début de vos messages envoyés à ce groupe pour aider le diagnostic des équipes de support afin d'améliorer la précision des réponses à vos questions"/>
@@ -27,7 +53,18 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
-						<layout_panel name="input_button_layout_panel"><button name="send_chat" label="Envoyer" tool_tip="Envoyer l'IM"/></layout_panel>
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="Affiche le panneau des émojis"/>
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="Affiche/masque les émojis récents"/>
+						</layout_panel>
+						<layout_panel name="input_button_layout_panel">
+							<button name="send_chat" label="Envoyer" tool_tip="Envoyer l'IM"/>
+						</layout_panel>
+						<layout_panel name="emoji_recent_layout_panel">
+							<text name="emoji_recent_empty_text">
+								Les emojis récemment utilisés apparaîtront ici
+							</text>
+						</layout_panel>
 					</layout_stack>
 				</layout_panel>
 			</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/fr/floater_fs_nearby_chat.xml
index 80c65117f9..0ba5774936 100644
--- a/indra/newview/skins/default/xui/fr/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fs_nearby_chat.xml
@@ -14,7 +14,13 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
-						<layout_panel name="input_button_layout_panel"><spinner name="ChatChannel" tool_tip="Canal dans lequel parler. Modifiable dans les Préférences -&gt; Conversations -&gt; Saisie -&gt; Afficher la sélection du canal de discussion."/></layout_panel>
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="Affiche le panneau des émojis"/>
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="Affiche/masque les émojis récents"/>
+						</layout_panel>
+						<layout_panel name="input_button_layout_panel">
+							<spinner name="ChatChannel" tool_tip="Canal dans lequel parler. Modifiable dans les Préférences -&gt; Conversations -&gt; Saisie -&gt; Afficher la sélection du canal de discussion."/>
+						</layout_panel>
 						<layout_panel name="chat_type_layout_panel" width="90">
 							<combo_box name="chat_type" tool_tip="Chuchoter = 10m, Parler = 20m, Crier = 100m">
 								<combo_box.item name="chat_type_whisper" label="Chuchoter"/>
@@ -25,6 +31,11 @@
 						</layout_panel>
 					</layout_stack>
 				</layout_panel>
+				<layout_panel name="emoji_recent_layout_panel">
+					<text name="emoji_recent_empty_text">
+						Les émojis récemment utilisés apparaîtront ici
+					</text>
+				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
index c8eeb6f5b6..6586a3a4f6 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml
@@ -12,7 +12,18 @@
 			</layout_panel>
 			<layout_panel name="chat_layout_panel">
 				<layout_stack name="input_panels">
-					<layout_panel name="input_button_layout_panel"><button name="minz_btn" tool_tip="Affiche/Masque le panneau des messages"/></layout_panel>
+					<layout_panel name="input_editor_layout_panel">
+						<button name="emoji_recent_panel_toggle_btn" tool_tip="Affiche/masque les émojis récents"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Affiche/Masque le panneau des messages"/>
+					</layout_panel>
+					<layout_panel name="emoji_recent_layout_panel">
+						<text name="emoji_recent_empty_text">
+							Les émojis récemment utilisés apparaîtront ici
+						</text>
+						<button name="emoji_picker_show_btn" label="Plus" tool_tip="Affiche/masque le sélecteur d'émojis"/>
+					</layout_panel>
 				</layout_stack>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/menu_fs_chat_options.xml b/indra/newview/skins/default/xui/fr/menu_fs_chat_options.xml
index b4595de308..816ae7f3dc 100644
--- a/indra/newview/skins/default/xui/fr/menu_fs_chat_options.xml
+++ b/indra/newview/skins/default/xui/fr/menu_fs_chat_options.xml
@@ -14,6 +14,7 @@
 	<menu_item_check label="Afficher les notifications de nouveau message" name="new_message_notification"/>
 	<menu_item_check label="Afficher la barre de chat" name="show_chat_bar"/>
 	<menu_item_check label="Afficher la sélection du canal" name="show_channel_selection"/>
+	<menu_item_check label="Afficher le bouton émoji" name="show_emoji_button"/>
 	<menu_item_check label="Afficher le boutons Chuchoter / Parler / Crier" name="show_send_button"/>
 	<menu_item_check label="Afficher le bouton Envoyer dans les IM" name="show_im_send_button"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index a824cf9ef5..ee3765a3a1 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -16,6 +16,11 @@
 	<menu label="Débogage" name="Debug">
 		<menu_item_call label="Afficher les paramètres de débogage" name="Debug Settings"/>
 		<menu_item_call label="Outil de prévisualisation XUI" name="UI Preview Tool"/>
+		<menu label="Polices" name="Fonts">
+			<menu_item_call label="Afficher le test de police" name="Show Font Test"/>
+			<menu_item_call label="Vider les polices" name="Dump Fonts"/>
+			<menu_item_call label="Vider les textures des polices" name="Dump Font Textures"/>
+		</menu>
 		<menu label="Tests d'interface" name="UI Tests">
 			<menu_item_call label="Zone de texte" name="Textbox"/>
 			<menu_item_call label="Éditeur de texte" name="Text Editor"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 26deb4a35b..875dad7fce 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -504,6 +504,8 @@
 			<menu_item_call label="Test du navigateur de médias" name="Web Browser Test"/>
 			<menu_item_check label="Test de redémarrage de la région..." name="Region Restart Test"/>
 			<menu_item_call label="Navigateur de contenus Web" name="Web Content Browser"/>
+			<menu_item_call label="Vider les polices" name="Dump Fonts"/>
+			<menu_item_call label="Vider les textures des polices" name="Dump Font Textures"/>
 			<menu_item_call label="Test de connexion FB" name="FB Connect Test"/>
 			<menu_item_call label="Dump SelectMgr" name="Dump SelectMgr"/>
 			<menu_item_call label="Dump inventaire" name="Dump Inventory"/>
@@ -516,6 +518,7 @@
 			<menu_item_check label="Débogage SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Débogage clics" name="Debug Clicks"/>
 			<menu_item_check label="Débogage des vues" name="Debug Views"/>
+			<menu_item_check label="Déboguer l'Unicode" name="Debug Unicode"/>
 			<menu_item_check label="Débogage des info-bulles de noms" name="Debug Name Tooltips"/>
 			<menu_item_check label="Débogage des événements de souris" name="Debug Mouse Events"/>
 			<menu_item_check label="Débogage touches" name="Debug Keys"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 7343ac9bf4..44cd4b210c 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -113,7 +113,9 @@
 			<check_box name="FSChatbarNamePrediction" label="Activer l'autocomplétion des noms dans le Chat local"/>
 			<check_box name="AllowMUpose" label="':' est un synonyme pour '/me'"/>
 			<check_box name="AutoCloseOOC" label="Fermer automatiquement les doubles parenthèses ((OOC))"/>
-			<check_box name="FSShowIMSendButton" label="Afficher le bouton envoyer dans les conversations privées"/>
+			<check_box name="FSEnableEmojiWindowPopupWhileTyping" label="Activer la fenêtre de sélection auto des émojis lors de la saisie dans la barre de chat"/>
+			<check_box name="FSShowEmojiButton" label="Afficher le bouton emoji dans la barre de chat pour les IM et les discussions de proximité"/>
+			<check_box name="FSShowIMSendButton" label="Afficher le bouton d'envoi dans la barre de chat pour les sessions d'IM"/>
 			<check_box name="FSNearbyChatbar" label="Afficher une zone de saisie dans la fenêtre du Chat local"/>
 			<check_box name="FSShowChatChannel" label="Afficher la sélection du numéro canal dans la fenêtre du Chat local"/>
 			<check_box name="FSShowChatType" label="Afficher un bouton Parler / Chuchoter / Crier dans la fenêtre du Chat local"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
index ff8d3be577..c59f246a35 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
@@ -263,6 +263,11 @@ Domyślnie 0. Większa wartość może sprawiać kłopoty.
             <combo_item name="Medium" label="Średnia" />
             <combo_item name="Large" label="Duża" />
         </combo_box>
+        <text name="emoji_font_settings_label">
+            Ustawienia czcionki emoji: (wymaga restartu)
+        </text>
+        <check_box label="Wyświetlaj emoji monochromatycznie" name="FSUseBWEmojis" />
+        <check_box label="Użyj ładnego przycisku emoji" name="FSUsePrettyEmojiButton" />
     </panel>
 </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index 787378f246..2a6b7354c5 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -141,9 +141,9 @@
 			<check_box label="Włącz automatyczne odgadywanie imion w pasku czatu w pobliżu" name="FSChatbarNamePrediction"/>
 			<check_box name="AllowMUpose" label="&quot;:&quot; synonimem dla &quot;/me&quot;"/>
 			<check_box name="AutoCloseOOC" label="Domykaj ((nawiasy)) dla czatu OOC"/>
-			<check_box name="FSEnableEmojiWindowPopupWhileTyping" label="Włącz automatyczne wyświetlanie okna wyboru emoji podczas pisania w paskach czatu"/>
-			<check_box name="FSShowEmojiButton" label="Pokaż przycisk emoji w pasku czatu dla sesji IM i czatu w pobliżu"/>
-			<check_box name="FSShowIMSendButton" label="Pokaż przycisk wysyłania wiadomości w pasku czatu dla sesji IM"/>
+			<check_box name="FSEnableEmojiWindowPopupWhileTyping" label="Automatyczne wyświetlanie okna wyboru emoji podczas pisania w paskach czatu"/>
+			<check_box name="FSShowEmojiButton" label="Przycisk emoji w pasku czatu dla sesji IM i czatu w pobliżu"/>
+			<check_box name="FSShowIMSendButton" label="Przycisk wysyłania wiadomości w pasku czatu dla sesji IM"/>
 			<check_box name="FSNearbyChatbar" label="Dodaj pasek czatu do okna czatu w pobliżu"/>
 			<check_box name="FSShowChatChannel" label="Oferuj ręczny wybór kanału w pasku czatu"/>
 			<check_box name="FSShowChatType" label="Pokaż typ czatu i przycisk wysyłania"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_emoji_picker.xml b/indra/newview/skins/default/xui/ru/floater_emoji_picker.xml
new file mode 100644
index 0000000000..56286fbca0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_emoji_picker.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="emojipicker" title="Выберите эмодзи">
+	<floater.string name="title_for_recently_used" value="Недавно использованный"/>
+	<floater.string name="title_for_frequently_used" value="Часто используемый"/>
+	<text name="Dummy">Эмодзи не выбраны</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_fs_im_session.xml b/indra/newview/skins/default/xui/ru/floater_fs_im_session.xml
index 7fb369a8cc..a62ec2c8cb 100644
--- a/indra/newview/skins/default/xui/ru/floater_fs_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_fs_im_session.xml
@@ -49,14 +49,15 @@
 
 		<!-- Checkbox for FS prefix on support groups -->
 		<layout_panel name="support_panel">
-			<check_box label="Добавить версию" name="FSSupportGroupChatPrefix_toggle" tool_tip="Добавляет текущую версию клиента и информацию о теме в сообщения, отправленные вами в этой группе. Данная информация поможет сотрудникам поддержки в правильной диагностике Ваших проблем и повышения точности ответов на ваши вопросы"/>
+			<check_box label="Добавить версию" name="FSSupportGroupChatPrefix_toggle" tool_tip="Добавляет текущую версию и внешний вид программы просмотра, операционную систему и статус RLVa в начало сообщений, отправляемых вами в эту группу, что поможет сотрудникам службы поддержки правильно диагностировать ваши проблемы и повысить точность ответов на ваши вопросы"/>
 		</layout_panel>
 		<layout_panel name="testing_panel">
 			<check_box label="Добавить сборку" name="FSSupportGroupChatPrefixTesting_toggle"
-			tool_tip="Добавляет текущую версию, тему, операционную систему и состояние RLVa в начало сообщений, отправленных вами этой группе, что поможет персоналу службы поддержки правильно диагностировать ваши проблемы и повысить точность ответов на ваши вопросы. (Это отдельно от групп поддержки)"/>
+			tool_tip="Добавляет текущую версию и внешний вид программы просмотра, операционную систему и статус RLVa в начало сообщений, отправляемых вами в эту группу, что поможет сотрудникам службы поддержки правильно диагностировать ваши проблемы и повысить точность ответов на ваши вопросы. (Это отдельно от групп поддержки)"/>
 		</layout_panel>
 		<!-- END: FS Prefix -->
 	</layout_stack>
+
 	<layout_stack name="chat_stack">
 		<layout_panel name="panel_im_control_lp">
 			<layout_stack name="im_panels">
@@ -67,11 +68,18 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="Показать панель эмодзи"/>
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="Показывает/скрывает последние эмодзи"/>
+						</layout_panel>
 						<layout_panel name="input_button_layout_panel">
 							<button name="send_chat" label="Отправить" tool_tip="Отправляет сообщение" />
 						</layout_panel>
 					</layout_stack>
 				</layout_panel>
+				<layout_panel name="emoji_recent_layout_panel">
+					<text name="emoji_recent_empty_text">Здесь появятся недавно использованные эмодзи</text>
+				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/ru/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/ru/floater_fs_nearby_chat.xml
index 942f6b854b..88a1bc40d9 100644
--- a/indra/newview/skins/default/xui/ru/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ru/floater_fs_nearby_chat.xml
@@ -33,6 +33,10 @@
             <layout_panel name="input_editor_layout_panel">
               <chat_editor name="chat_box" />
             </layout_panel>
+            <layout_panel name="emoji_button_layout_panel">
+              <button name="emoji_picker_toggle_btn" tool_tip="Показать панель эмодзи"/>
+              <button name="emoji_recent_panel_toggle_btn" tool_tip="Показывает/скрывает последние эмодзи"/>
+            </layout_panel>
             <layout_panel name="input_button_layout_panel">
               <spinner name="ChatChannel" tool_tip="Канал отправки в чат. Включается в Настройки → Чат -> Печать -> Показать выбор канала в строке ввода общего чата." />
             </layout_panel>
@@ -47,6 +51,9 @@
             </layout_panel>
           </layout_stack>
         </layout_panel>
+        <layout_panel name="emoji_recent_layout_panel">
+          <text name="emoji_recent_empty_text">Здесь появятся недавно использованные эмодзи</text>
+        </layout_panel>
       </layout_stack>
     </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
index 026398fbbc..02c91c4b85 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml
@@ -34,13 +34,18 @@
 			<layout_panel name="chat_layout_panel">
 				<layout_stack name="input_panels">
 					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="Кому" name="chat_editor"/>
+						<button name="emoji_recent_panel_toggle_btn" tool_tip="Показывает/скрывает последние эмодзи"/>
 					</layout_panel>
 					<layout_panel name="input_button_layout_panel">
 						<button name="minz_btn" tool_tip="Показать/скрыть панель сообщений"/>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
+			<layout_panel name="emoji_recent_layout_panel">
+				<text name="emoji_recent_empty_text">Здесь появятся недавно использованные эмодзи</text>
+				<emoji_complete name="emoji_recent_icons_ctrl"/>
+				<button name="emoji_picker_show_btn" label="Еще" tool_tip="Показывает/скрывает средство выбора эмодзи"/>
+			</layout_panel>
 		</layout_stack>
 	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_fs_chat_options.xml b/indra/newview/skins/default/xui/ru/menu_fs_chat_options.xml
index e1c451fad9..a96f42ef42 100644
--- a/indra/newview/skins/default/xui/ru/menu_fs_chat_options.xml
+++ b/indra/newview/skins/default/xui/ru/menu_fs_chat_options.xml
@@ -15,6 +15,7 @@
 	<menu_item_check label="Показать оповещение новых сообщений" name="new_message_notification"/>
 	<menu_item_check label="Показать строку набора" name="show_chat_bar"/>
 	<menu_item_check label="Показать выбор канала" name="show_channel_selection"/>
+	<menu_item_check label="Показать кнопку эмодзи" name="show_emoji_button"/>
 	<menu_item_check label="Показать кнопку Тип/Отправка" name="show_send_button"/>
 	<menu_item_check label="Показать кнопку Отправить в ЛС" name="show_im_send_button"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
index fad02d0ed0..599dd878c6 100644
--- a/indra/newview/skins/default/xui/ru/menu_login.xml
+++ b/indra/newview/skins/default/xui/ru/menu_login.xml
@@ -26,6 +26,11 @@
 	<menu label="Отладка" name="Debug">
 		<menu_item_call label="Показать настройки отладки" name="Debug Settings"/>
 		<menu_item_call label="Инструменты просмотра XUI" name="UI Preview Tool"/>
+		<menu label="Шрифты" name="Fonts">
+			<menu_item_call label="Показать тест шрифта" name="Show Font Test"/>
+			<menu_item_call label="Дамп шрифтов" name="Dump Fonts"/>
+			<menu_item_call label="Дамп текстур шрифтов" name="Dump Font Textures"/>
+		</menu>
 		<menu label="Тесты интерфейса" name="UI Tests"/>
 		<menu_item_call label="Установить размер окна..." name="Set Window Size..."/>
 		<menu_item_call label="Показать условия использования (ТОS)" name="TOS"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 8d0498ee9e..18f8ad3b38 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -593,6 +593,8 @@
 			<menu_item_call label="Тест браузера для просмотра медиа" name="Web Browser Test"/>
 			<menu_item_check label="Тест перезапуска региона..." name="Region Restart Test"/>
 			<menu_item_call label="Браузер Web содержимого" name="Web Content Browser"/>
+			<menu_item_call label="Дамп шрифтов" name="Dump Fonts"/>
+			<menu_item_call label="Дамп текстур шрифтов" name="Dump Font Textures"/>
 			<menu_item_call label="Тест соединения с Facebook" name="FB Connect Test"/>
 			<menu_item_call label="Дамп SelectMgr" name="Dump SelectMgr"/>
 			<menu_item_call label="Дамп инвентаря" name="Dump Inventory"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index 0b3a989c35..83bac4f5f1 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -141,6 +141,8 @@
 			<check_box label="Включить автоматическую подстановку имени в общем чате" name="FSChatbarNamePrediction"/>
 			<check_box name="AllowMUpose" label="&quot;:&quot; как синоним для &quot;/me&quot;"/>
 			<check_box name="AutoCloseOOC" label="Закрывает ((скобки)) для чата OOC"/>
+			<check_box name="FSEnableEmojiWindowPopupWhileTyping" label="Включите окно автоматического выбора эмодзи при вводе текста в панелях чата"/>
+			<check_box name="FSShowEmojiButton" label="Показывать кнопку эмодзи в панели чата для сеансов обмена мгновенными сообщениями и чата"/>
 			<check_box name="FSShowIMSendButton" label="Показать кнопку отправки в строке набора для ЛС"/>
 			<check_box name="FSNearbyChatbar" label="Добавить строку ввода в окно общего чата"/>
 			<check_box name="FSShowChatChannel" label="Показать выбор канала в окне общего чата"/>

From 727529d9ac99f8168b57c5f15206ff37f6dd49ea Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 13 Mar 2024 01:14:49 +0100
Subject: [PATCH 35/38] FIRE-33763 Small French translation update, by Laurent
 Bechir

---
 indra/newview/skins/default/xui/fr/panel_preferences_UI.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_UI.xml b/indra/newview/skins/default/xui/fr/panel_preferences_UI.xml
index f4f16a6a5c..de3541c82f 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_UI.xml
@@ -158,6 +158,7 @@
 			<check_box label="Afficher les toasts au premier plan" name="FSShowToastsInFront"/>
 			<check_box label="Utiliser la nouvelle notification de redémarrage de région" name="FSUseNewRegionRestartNotification"/>
 			<check_box label="Ne pas secouer l'écran lorsqu'une notification de redémarrage de région est affichée" name="FSNoScreenShakeOnRegionRestart"/>
+			<check_box label="Canal d'infos redémarrage région :" name="FSReportRegionRestartToChat"/>
 		</panel>
 		<panel label="Police" name="UI-font-tab">
 			<text name="tooltip_textbox1">Police d'écriture :</text>
@@ -188,6 +189,11 @@
 				<combo_item name="Medium" label="Moyenne"/>
 				<combo_item name="Large" label="Grande"/>
 			</combo_box>
+			<text name="emoji_font_settings_label">
+				Paramétrage de la police Emoji : (redémarrage nécessaire pour un effet complet)
+			</text>
+			<check_box label="Afficher les emojis en monochrome :" name="FSUseBWEmojis"/>
+			<check_box label="Utiliser le joli bouton Emoji :" name="FSUsePrettyEmojiButton"/>
 		</panel>
 	</tab_container>
 </panel>

From bb9702430048d9c36c90ea11e9a38a7b52ef6665 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 16 Mar 2024 19:57:22 +0000
Subject: [PATCH 36/38] FIRE-33773 - avoid OOB access under certain conditions

---
 indra/llui/llemojihelper.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index cf431b4039..96e92f3379 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -64,7 +64,7 @@ bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S
 		return false;
 	}
 	// </FS:PP>
-
+	if (cursorPos < 0 || wtext.size() < cursorPos) return false; // <FS:Beq/> FIRE-33773 - fix logic to avoid OOB access to wtext
 	// If the cursor is currently on a colon start the check one character further back
 	S32 shortCodePos = (cursorPos == 0 || L':' != wtext[cursorPos - 1]) ? cursorPos : cursorPos - 1;
 
@@ -84,7 +84,7 @@ bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S
 		shortCodePos--;
 	}
 
-	bool isShortCode = (L':' == wtext[shortCodePos - 1]) && (cursorPos - shortCodePos >= 2);
+	bool isShortCode = (cursorPos - shortCodePos >= 2) && (L':' == wtext[shortCodePos - 1]); // <FS:Beq/> FIRE-33773 - fix logic to avoid OOB access to wtext
 	if (pShortCodePos)
 		*pShortCodePos = (isShortCode) ? shortCodePos - 1 : -1;
 	return isShortCode;

From be4a9f3023f7456abfdb01e6911278ccaf6b9e1e Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 17 Mar 2024 17:34:04 +0100
Subject: [PATCH 37/38] FIRE-33775 Russian translation update, by Romka
 Swallowtail

---
 .../newview/skins/default/xui/ru/panel_preferences_UI.xml | 5 +++++
 .../skins/default/xui/ru/panel_preferences_chat.xml       | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_UI.xml b/indra/newview/skins/default/xui/ru/panel_preferences_UI.xml
index 77b37113ef..82c599f71c 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_UI.xml
@@ -275,6 +275,11 @@
              <combo_item name="Medium" label="Средний"/>
              <combo_item name="Large" label="Крупный"/>
         </combo_box>
+        <text name="emoji_font_settings_label">
+          Настройки шрифта Эмодзи: (требуется перезапуск)
+        </text>
+        <check_box name="FSUseBWEmojis" label="Отображать эмодзи монохромно"/>
+        <check_box name="FSUsePrettyEmojiButton" label="Использовать красивую кнопку Эмодзи"/>
     </panel>
 </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index 83bac4f5f1..109e1e6393 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -142,7 +142,7 @@
 			<check_box name="AllowMUpose" label="&quot;:&quot; как синоним для &quot;/me&quot;"/>
 			<check_box name="AutoCloseOOC" label="Закрывает ((скобки)) для чата OOC"/>
 			<check_box name="FSEnableEmojiWindowPopupWhileTyping" label="Включите окно автоматического выбора эмодзи при вводе текста в панелях чата"/>
-			<check_box name="FSShowEmojiButton" label="Показывать кнопку эмодзи в панели чата для сеансов обмена мгновенными сообщениями и чата"/>
+			<check_box name="FSShowEmojiButton" label="Показывать кнопку эмодзи в панелях чата и сеансов обмена сообщениями"/>
 			<check_box name="FSShowIMSendButton" label="Показать кнопку отправки в строке набора для ЛС"/>
 			<check_box name="FSNearbyChatbar" label="Добавить строку ввода в окно общего чата"/>
 			<check_box name="FSShowChatChannel" label="Показать выбор канала в окне общего чата"/>
@@ -271,15 +271,15 @@
 			<text name="FSCmdLineClearChat_txt">
 				Очистить историю чата
 			</text>
-			<line_editor tool_tip="Czyści logi czatu, aby zapobiec lagom pochodzącym od spamerów." name="FSCmdLineClearChat" />
+			<line_editor tool_tip="Очищает расшифровку чата, чтобы предотвратить эффект задержки от спамеров в чате." name="FSCmdLineClearChat" />
 			<text name="FSCmdLineMedia_txt">
 				Установить url для медиа
 			</text>
-			<line_editor tool_tip="Ustawia i odtwarza strumień mediów dla podanego URL" name="FSCmdLineMedia" />
+			<line_editor tool_tip="Устанавливает и воспроизводит ваш медиапоток по введенному URL-адресу" name="FSCmdLineMedia" />
 			<text name="FSCmdLineMusic_txt">
 				Установить url для потоковой музыки
 			</text>
-			<line_editor tool_tip="Ustawia i odtwarza strumień muzyki dla podanego URL" name="FSCmdLineMusic" />
+			<line_editor tool_tip="устанавливает и воспроизводит ваш музыкальный поток по введенному URL-адресу" name="FSCmdLineMusic" />
 			<text name="FSCmdLineRezPlatform_txt">
 				Выложить платформу (0 - 64)
 			</text>

From 159b94d8ea8cae6e5cfedc7b129b2e38e04dc5f5 Mon Sep 17 00:00:00 2001
From: Pork Chop <mygoditsfullofstars@phoenixviewer.com>
Date: Mon, 18 Mar 2024 19:58:23 +1100
Subject: [PATCH 38/38] Linux: dullahan + cef - same version, replace with zstd
 compressed package instead.

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

diff --git a/autobuild.xml b/autobuild.xml
index ec47c4bbf4..9bf6ba5b2a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -808,9 +808,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c539c58aee1d010928ae29ad344656a5</string>
+              <string>2845d791c0f00392ba1573bc645a0fc8a7fd37ae</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://3p.firestormviewer.org/dullahan-1.14.0.202311061750_118.6.8_ge44bee1_chromium-118.0.5993.117-linux64-233100650.tar.bz2</string>
+              <string>https://3p.firestormviewer.org/dullahan-1.14.0.202403161609_118.6.8_ge44bee1_chromium-118.0.5993.117-linux64-240760509.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>