From b16ee87430deff6c83cd35685fbe6c217f0571f6 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Tue, 21 May 2024 17:34:11 +0200
Subject: [PATCH 01/42] FIRE-33938 Russian translation update, by Romka
 Swallowtail

---
 .../default/xui/ru/floater_emoji_picker.xml   |  1 +
 .../default/xui/ru/floater_media_browser.xml  | 13 +++++--
 .../xui/ru/floater_preview_gesture.xml        |  7 ++--
 .../skins/default/xui/ru/menu_inventory.xml   |  1 +
 .../skins/default/xui/ru/menu_outfit_gear.xml |  4 +--
 .../skins/default/xui/ru/menu_outfit_tab.xml  |  4 +--
 .../skins/default/xui/ru/menu_viewer.xml      |  2 +-
 .../skins/default/xui/ru/notifications.xml    | 34 ++++++++++++++-----
 .../xui/ru/panel_group_info_sidetray.xml      |  7 ++--
 .../default/xui/ru/panel_group_list_item.xml  |  1 +
 .../xui/ru/panel_group_list_item_short.xml    |  1 +
 .../xui/ru/panel_profile_secondlife.xml       |  1 +
 .../default/xui/ru/sidepanel_task_info.xml    |  2 +-
 .../newview/skins/default/xui/ru/strings.xml  | 25 ++++++++++++--
 14 files changed, 78 insertions(+), 25 deletions(-)

diff --git a/indra/newview/skins/default/xui/ru/floater_emoji_picker.xml b/indra/newview/skins/default/xui/ru/floater_emoji_picker.xml
index 56286fbca0..f12f3d2751 100644
--- a/indra/newview/skins/default/xui/ru/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/ru/floater_emoji_picker.xml
@@ -2,5 +2,6 @@
 <floater name="emojipicker" title="Выберите эмодзи">
 	<floater.string name="title_for_recently_used" value="Недавно использованный"/>
 	<floater.string name="title_for_frequently_used" value="Часто используемый"/>
+	<floater.string name="text_no_emoji_for_filter" value="Не найдено эмодзи для '[FILTER]'"/>
 	<text name="Dummy">Эмодзи не выбраны</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_media_browser.xml b/indra/newview/skins/default/xui/ru/floater_media_browser.xml
index dae566a102..eb0f9c0e25 100644
--- a/indra/newview/skins/default/xui/ru/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ru/floater_media_browser.xml
@@ -11,7 +11,7 @@
 			<button label="Назад" name="back"/>
 			<button label="Вперед" name="forward"/>
 			<button label="Обновить" name="reload"/>
-			<button label="Перейти" name="go"/>
+			<button label="Зайти" name="go"/>
 		</layout_panel>
 		<layout_panel name="time_controls">
 			<button label="назад" name="rewind"/>
@@ -19,11 +19,18 @@
 			<button label="вперед" name="seek"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
-			<button label="Отправить текущую страницу на участок" name="assign"/>
+			<button label="Отправить страницу на участок" name="assign"/>
 		</layout_panel>
 		<layout_panel name="external_controls">
+			<text name="plugin_fail_text">
+Похоже, что плагин для веб-браузера открывается не сразу.
+Если плагин не загружается, пожалуйста, посетите сайт:
+
+https://wiki.firestormviewer.org/fs_media
+
+для информации о возможных действиях по устранению этой проблемы.
+			</text>
 			<button label="Открыть в моем браузере" name="open_browser"/>
-			<check_box label="Всегда открывать в моем браузере" name="open_always"/>
 			<button label="Закрыть" name="close"/>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml
index fde2cea00e..e2ac451300 100644
--- a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml
@@ -62,12 +62,13 @@
 		<radio_item label="Старт" name="start"/>
 		<radio_item label="Стоп" name="stop"/>
 	</radio_group>
-	<check_box label="до завершения анимации" name="wait_anim_check"/>
-	<check_box label="время в секундах:" name="wait_time_check"/>
+	<check_box label="пока нажата кнопка" name="wait_key_release_check" />
+	<check_box label="до конца анимации" name="wait_anim_check"/>
+	<check_box label="время, секунды:" name="wait_time_check"/>
 	<text name="help_label">
 		Все шаги выполняются одновременно, если только вы не добавите шаги ожидания.
 	</text>
 	<check_box label="Активный" name="active_check" tool_tip="Активные жесты можно включить путем ввода их триггеров в чат или нажатием горячих клавиш.  Жесты обычно становятся неактивными, если возникает конфликт клавиш."/>
-	<button label="Предварительный просмотр" name="preview_btn"/>
+	<button label="Просмотр" name="preview_btn"/>
 	<button label="Сохранить" name="save_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml
index 2eda6a3162..f318d3abd3 100644
--- a/indra/newview/skins/default/xui/ru/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml
@@ -18,6 +18,7 @@
 	<menu_item_call label="Очистить корзину" name="Empty Trash"/>
 	<menu_item_call label="Очистить 'Найденные вещи'" name="Empty Lost And Found"/>
 	<menu_item_call label="Новая папка" name="New Folder"/>
+	<menu_item_call label="Новая папка" name="New Listing Folder"/>
 	<menu_item_call label="Новый комплект одежды" name="New Outfit"/>
 	<menu_item_call label="Новый скрипт" name="New Script"/>
 	<menu_item_call label="Новая заметка" name="New Note"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
index 3c7683dbe8..7d3b953db7 100644
--- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Outfit">
-	<menu_item_call label="Переодеться" name="wear"/>
-	<menu_item_call label="Надеть" name="wear_add"/>
+	<menu_item_call label="Переодеться (заменить)" name="wear"/>
+	<menu_item_call label="Надеть (добавить)" name="wear_add"/>
 	<menu_item_call label="Снять" name="take_off"/>
 	<menu_item_call label="Изображение" name="thumbnail"/>
 	<menu_item_call label="Переименовать костюм" name="rename"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml
index 7af60b5901..5c117d95fb 100644
--- a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit">
-	<menu_item_call label="Переодеться" name="wear_replace"/>
-	<menu_item_call label="Надеть" name="wear_add"/>
+	<menu_item_call label="Переодеться (заменить)" name="wear_replace"/>
+	<menu_item_call label="Надеть (добавить)" name="wear_add"/>
 	<menu_item_call label="Снять" name="take_off"/>
 	<menu_item_call label="Изменить костюм" name="edit"/>
 	<menu_item_call label="Изображение..." name="thumbnail"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 151e3a7ce9..d11494a6ec 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -37,7 +37,7 @@
 		</menu>
 
 		<menu_item_call label="Выберите аватар" name="Avatar Picker"/>
-
+		<menu_item_call label="Удалить выбранные присоединения" name="Remove Selected Attachments"/>
 		<menu_item_call label="Высота смещения" name="HoverHeight"/>
 		<menu label="Движение" name="Movement">
 			<menu_item_call label="Встать" name="Stand up"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index c38b199ee7..2f2ac8307f 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -118,6 +118,11 @@
 		Не удалось активировать эту папку версии, ошибка:
 
         &quot;[ERROR_CODE]&quot;
+	</notification>
+	<notification name="InvalidKeystroke">
+Было введено неверное нажатие клавиши.
+[REASON].
+Пожалуйста, введите правильный текст.
 	</notification>
 	<notification name="MerchantForceValidateListing">
 		Для того, чтобы создать свой список, мы исправили иерархию вашего списка содержимого.
@@ -1749,18 +1754,18 @@
 		<usetemplate ignoretext="Подтверждать перед возвратом объектов владельцам" name="okcancelignore" notext="Отмена" yestext="Да"/>
 	</notification>
 	<notification name="GroupLeaveConfirmMember">
-		В настоящее время вы состоите в группе &lt;nolink&gt;[GROUP]&lt;/nolink&gt;.
-Хотите выйти из группы?
-		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Да"/>
+Покинуть группу &apos;&lt;nolink&gt;[GROUP]&lt;/nolink&gt;&apos;?
+В настоящее время плата за вступление в эту группу L$[COST].
+		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Покинуть"/>
+	</notification>
+	<notification name="GroupLeaveConfirmMemberNoFee">
+Покинуть группу &apos;&lt;nolink&gt;[GROUP]&lt;/nolink&gt;&apos;?
+В настоящее время плата за вступление в эту группу не взимается.
+		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Покинуть"/>
 	</notification>
 	<notification name="GroupDepart">
 		Вы покинули группу «[group_name]».
 	</notification>
-	<notification name="GroupLeaveConfirmMemberWithFee">
-		Вы в настоящее время являетесь участником группы &lt;nolink&gt;[GROUP]&lt;/nolink&gt;. Присоединение снова будет стоить L$[AMOUNT].
-Покинуть группу?
-		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Да"/>
-	</notification>
 	<notification name="OwnerCannotLeaveGroup">
 		Невозможно выйти из группы. Вы не можете покинуть группу, потому что вы единственый владелец группы. Пожалуйста, назначить сначала назначьте на данную роль другого пользователя.
 	</notification>
@@ -2457,6 +2462,19 @@
 Вы уверены, что хотите удалить их?
 		<usetemplate ignoretext="Подтвердить удаление отфильтрованных элементов" name="okcancelignore" notext="Отмена" yestext="Да"/>
 	</notification>
+
+	<notification name="DeleteWornItems">
+Предмет(ы) которые вы хотите удалить надеты на ваш аватар.
+Удалить эти элементы со своего аватара?
+		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Снять и удалить предмет(ы)"/>
+	</notification>
+
+	<notification name="CantDeleteRequiredClothing">
+Предмет(ы), которые вы хотите удалить, относятся к обязательным слоям одежды (кожа, фигура, волосы, глаза).
+Вы должны заменить эти слои, прежде чем удалять их.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+
 	<notification name="DeleteThumbnail">
 		Удалить изображение этого товара? Отмена невозможна.
 		<usetemplate ignoretext="Подтвердите перед удалением миниатюры." name="okcancelignore" notext="Отмена" yestext="Удалить"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
index 73675bd355..a404787736 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
@@ -9,9 +9,10 @@
 	<panel.string name="group_join_btn">
 		Присоединиться (L$[AMOUNT])
 	</panel.string>
-	<panel.string name="group_join_free">
-		Бесплатно
-	</panel.string>
+	<panel.string name="group_join_free">Бесплатно</panel.string>
+	<panel.string name="group_member">Член</panel.string>
+	<panel.string name="join_txt">Вступить</panel.string>
+	<panel.string name="leave_txt">Покинуть</panel.string>
 
 	<layout_stack name="group_info_sidetray_main">
 		<layout_panel name="header_container">
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
index 7327582c0c..7355b56513 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Неизвестно"/>
+	<button name="notices_btn" tool_tip="Групповые уведомления"/>
 	<button name="info_btn" tool_tip="Дополнительная информация"/>
 	<button name="profile_btn" tool_tip="Просмотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item_short.xml
index bd4851f724..2dbb10f283 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_list_item_short.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Неизвестно"/>
+	<button name="notices_btn" tool_tip="Групповые уведомления"/>
 	<button name="visibility_hide_btn" tool_tip="Скрыть группу в моем профиле"/>
 	<button name="visibility_show_btn" tool_tip="Показывать группу в моем профиле"/>
 	<button name="info_btn" tool_tip="Больше информации"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml
index 30db74528b..53e4a4e2a0 100644
--- a/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/ru/panel_profile_secondlife.xml
@@ -68,6 +68,7 @@
 		</layout_panel>
 	</layout_stack>
 	<check_box name="show_in_search" label="Показать в поиске" tool_tip="Позволить людям видеть вас в результатах поиска"/>
+	<check_box name="hide_sl_age" label="Показать полную дату рождения" tool_tip="Позволить людям видеть ваш возраст в СЛ"/>
 	<button name="save_description_changes" label="Сохранить"/>
 	<button name="discard_description_changes" label="Отказаться"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
index 00603547da..7475a8033a 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -83,8 +83,8 @@
 				<combo_box.item label="Заплатить за объект" name="Payobject"/>
 				<combo_box.item label="Открыть" name="Open"/>
 				<combo_box.item label="Приблизить" name="Zoom"/>
-				<combo_box.item label="Игнорировать объект" name="Ignoreobject"/>
 				<combo_box.item label="Нет" name="None"/>
+				<combo_box.item label="Игнорировать объект" name="Ignoreobject"/>
 			</combo_box>
 			<panel name="perms_inv">
 				<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index f9fe87dcbb..97b0cecaef 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -1444,6 +1444,20 @@ https://www.firestormviewer.org/support за помощь в решении эт
 	<string name="executable_files">
 		Исполняемые файлы программы
 	</string>
+
+	<string name="Validator_InvalidNumericString">Недопустимая числовая строка: "[STR]"</string>
+	<string name="Validator_ShouldNotBeMinus">Недопустимый начальный символ: '[CH]' (не должно быть минусом)</string>
+	<string name="Validator_ShouldNotBeMinusOrZero">Недопустимый начальный символ: '[CH]' (не должно быть ни минуса, ни нуля)</string>
+	<string name="Validator_ShouldBeDigit">Недопустимый символ [NR]: '[CH]' (должна быть только цифра)</string>
+	<string name="Validator_ShouldBeDigitOrDot">Недопустимый символ [NR]: '[CH]' (должна быть только цифра или десятичная точка)</string>
+	<string name="Validator_ShouldBeDigitOrAlpha">Недопустимый символ [NR]: '[CH]' (должна быть только цифра или буквенно-цифровой символ ASCII)</string>
+	<string name="Validator_ShouldBeDigitOrAlphaOrSpace">Недопустимый символ [NR]: '[CH]' (должна быть только цифра или буквенно-цифровой символ ASCII или пробел)</string>
+	<string name="Validator_ShouldBeDigitOrAlphaOrPunct">Недопустимый символ [NR]: '[CH]' (должна быть только цифра или буквенно-цифровой символ ASCII или пунктуация)</string>
+	<string name="Validator_ShouldBeDigitOrAlphaOrPunctNotSpace">Недопустимый символ [NR]: '[CH]' (должна быть только цифра или буквенно-цифровой символ ASCII или пунктуация без пробела)</string>
+	<string name="Validator_ShouldBeDigitNotSpace">Недопустимый символ [NR]: '[CH]' (должна быть только цифра без пробела)</string>
+	<string name="Validator_ShouldBeASCII">Недопустимый символ [NR]: '[CH]' (должен быть только символ ASCII)</string>
+	<string name="Validator_ShouldBeNewLineOrASCII">Недопустимый символ [NR]: '[CH]' (должен быть только символ ASCII или новая строка)</string>
+
 	<string name="LSLTipSleepTime">
 		Пауза скрипта на [SLEEP_TIME] секунд.
 	</string>
@@ -5297,9 +5311,12 @@ https://www.firestormviewer.org/support за помощь в решении эт
 	<string name="dance8">
 		танец8
 	</string>
-	<string name="AvatarBirthDateFormat">
+	<string name="AvatarBirthDateFormatFull">
 		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc]
 	</string>
+	<string name="AvatarBirthDateFormatShort">
+		[day,datetime,utc].[mthnum,datetime,utc]
+	</string>
 	<string name="AvatarBirthDateFormat_legacy">
 		[day,datetime,slt].[mthnum,datetime,slt].[year,datetime,slt]
 	</string>
@@ -5417,7 +5434,8 @@ https://www.firestormviewer.org/support за помощь в решении эт
 		Для этого комплекта одежды нет вещей
 	</string>
 	<string name="ExternalEditorNotSet">
-		Выберите редактор, используя параметр ExternalEditor.
+		Выберите редактор, установив переменную среды LL_SCRIPT_EDITOR или параметр Внешнего Редактора.
+смотрите https://wiki.secondlife.com/wiki/LSL_Alternate_Editors
 	</string>
 	<string name="ExternalEditorNotFound">
 		Не удается найти указанный внешний редактор.
@@ -6580,6 +6598,9 @@ ID объекта: [INSPECTING_KEY]
 	<string name="avatar_age_alert">
 		сработало возрастное предупреждение. Возраст: [AGE] дней
 	</string>
+	<string name="avatar_age_not_available">
+		н.д.
+	</string>
 	<string name="TotalScriptCountChangeIncrease">
 		Количество скриптов в регионе возросло с [OLD_VALUE] до [NEW_VALUE] ([DIFFERENCE]).
 	</string>

From 10fb2fc411d17f323c521c4182fe9b081201e62a Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 22 May 2024 19:18:20 +0200
Subject: [PATCH 02/42] Adjust Copy3rdPartyLibs.cmake for Visual Studio 2022
 17.10.0 and greater

---
 indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 7938d4f54b..27b20ee3b1 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -107,7 +107,7 @@ if(WINDOWS)
         set(MSVC_VER 140)
     elseif (MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1930) # Visual Studio 2019
         set(MSVC_VER 140)
-    elseif (MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1940) # Visual Studio 2022
+    elseif (MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1950) # Visual Studio 2022
         set(MSVC_VER 140)
     else (MSVC80)
         MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake")

From 924edc0abca450de64334f94956e116a891610c7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 22 May 2024 19:24:05 +0200
Subject: [PATCH 03/42] Fix builds with latest VS 2022 version 17.10.0 and
 newer

---
 indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index f2730c0494..ec3e4a76a4 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -117,7 +117,7 @@ if(WINDOWS)
     elseif (MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1930) # Visual Studio 2019
         set(MSVC_VER 140)
         set(MSVC_TOOLSET_VER 142)
-    elseif (MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1940) # Visual Studio 2022
+    elseif (MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1950) # Visual Studio 2022
         set(MSVC_VER 140)
         set(MSVC_TOOLSET_VER 143)
     else (MSVC80)

From 0647597e8e2b0318baffa376b14b0fafc2348db6 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 24 May 2024 09:34:56 +0200
Subject: [PATCH 04/42] Prevent unnecessary string copies

---
 indra/llcommon/llstring.h  | 1 +
 indra/newview/fscommon.cpp | 8 ++++----
 indra/newview/fscommon.h   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index e87f8feddf..eb706aea21 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -456,6 +456,7 @@ template<class T> std::string LLStringUtilBase<T>::sLocale;
 typedef LLStringUtilBase<char> LLStringUtil;
 typedef LLStringUtilBase<llwchar> LLWStringUtil;
 typedef std::basic_string<llwchar> LLWString;
+typedef std::basic_string_view<llwchar> LLWStringView;
 
 //@ Use this where we want to disallow input in the form of "foo"
 //  This is used to catch places where english text is embedded in the code
diff --git a/indra/newview/fscommon.cpp b/indra/newview/fscommon.cpp
index 4f0d4a2487..cd81ad04e3 100644
--- a/indra/newview/fscommon.cpp
+++ b/indra/newview/fscommon.cpp
@@ -505,7 +505,7 @@ bool FSCommon::isFilterEditorKeyCombo(KEY key, MASK mask)
 
 LLUUID FSCommon::getGroupForRezzing()
 {
-    LLUUID group_id = gAgent.getGroupID();
+    LLUUID group_id{ gAgent.getGroupID() };
     LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 
     if (parcel && gSavedSettings.getBOOL("RezUnderLandGroup"))
@@ -523,12 +523,12 @@ LLUUID FSCommon::getGroupForRezzing()
     return group_id;
 }
 
-void FSCommon::updateUsedEmojis(LLWString text)
+void FSCommon::updateUsedEmojis(LLWStringView text)
 {
     LLEmojiDictionary* dictionary = LLEmojiDictionary::getInstance();
 
-    bool emojiSent = false;
-    for (llwchar& c : text)
+    bool emojiSent{ false };
+    for (const llwchar& c : text)
     {
         if (dictionary->isEmoji(c))
         {
diff --git a/indra/newview/fscommon.h b/indra/newview/fscommon.h
index 2cd77627a9..2e7946b0e5 100644
--- a/indra/newview/fscommon.h
+++ b/indra/newview/fscommon.h
@@ -94,7 +94,7 @@ namespace FSCommon
 
     LLUUID getGroupForRezzing();
 
-    void updateUsedEmojis(LLWString text);
+    void updateUsedEmojis(LLWStringView text);
 };
 
 #endif // FS_COMMON_H

From b986092076fd37a2c78ad90ac991943b735db370 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 25 May 2024 13:30:58 +0200
Subject: [PATCH 05/42] Speculative fix for crashes during TP

---
 indra/newview/fsradar.cpp      |  53 +++++++++++++---
 indra/newview/fsradar.h        |   5 ++
 indra/newview/fsradarentry.cpp | 110 +++++++++------------------------
 indra/newview/fsradarentry.h   |   4 +-
 4 files changed, 81 insertions(+), 91 deletions(-)

diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp
index 674d2a4339..7da19a4eb2 100644
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@@ -90,13 +90,15 @@ public:
 //=============================================================================
 
 FSRadar::FSRadar() :
-        mRadarAlertRequest(false),
-        mRadarFrameCount(0),
-        mRadarLastBulkOffsetRequestTime(0),
-        mRadarLastRequestTime(0.f),
-        mShowUsernamesCallbackConnection(),
-        mNameFormatCallbackConnection(),
-        mAgeAlertCallbackConnection()
+    mRadarAlertRequest(false),
+    mRadarFrameCount(0),
+    mRadarLastBulkOffsetRequestTime(0),
+    mRadarLastRequestTime(0.f),
+    mShowUsernamesCallbackConnection(),
+    mNameFormatCallbackConnection(),
+    mAgeAlertCallbackConnection(),
+    mRegionCapabilitiesReceivedCallbackConnection(),
+    mRegionChangedCallbackConnection()
 {
     // Use the callback from LLAvatarNameCache here or we might update the names too early!
     LLAvatarNameCache::getInstance()->addUseDisplayNamesCallback(boost::bind(&FSRadar::updateNames, this));
@@ -104,10 +106,18 @@ FSRadar::FSRadar() :
 
     mNameFormatCallbackConnection = gSavedSettings.getControl("RadarNameFormat")->getSignal()->connect(boost::bind(&FSRadar::updateNames, this));
     mAgeAlertCallbackConnection = gSavedSettings.getControl("RadarAvatarAgeAlertValue")->getSignal()->connect(boost::bind(&FSRadar::updateAgeAlertCheck, this));
+
+    mRegionChangedCallbackConnection = gAgent.addRegionChangedCallback([this]() { onRegionChanged(); });
 }
 
 FSRadar::~FSRadar()
 {
+    gAgent.removeRegionChangedCallback(mRegionChangedCallbackConnection);
+    if (mRegionCapabilitiesReceivedCallbackConnection.connected())
+    {
+        mRegionCapabilitiesReceivedCallbackConnection.disconnect();
+    }
+
     if (mShowUsernamesCallbackConnection.connected())
     {
         mShowUsernamesCallbackConnection.disconnect();
@@ -1040,8 +1050,35 @@ void FSRadar::updateAgeAlertCheck()
 
 void FSRadar::updateNotes(const LLUUID& avatar_id, std::string_view notes)
 {
-    if (auto entry = getEntry(avatar_id); entry)
+    if (auto entry = getEntry(avatar_id))
     {
         entry->setNotes(notes);
     }
 }
+
+void FSRadar::onRegionChanged()
+{
+    if (mRegionCapabilitiesReceivedCallbackConnection.connected())
+    {
+        mRegionCapabilitiesReceivedCallbackConnection.disconnect();
+    }
+
+    if (auto region = gAgent.getRegion())
+    {
+        if (region->capabilitiesReceived())
+        {
+            for (auto& [id, entry] : mEntryList)
+                entry->requestProperties();
+        }
+        else
+        {
+            mRegionCapabilitiesReceivedCallbackConnection = region->setCapabilitiesReceivedCallback(
+                [this](const LLUUID&, LLViewerRegion*)
+                {
+                    mRegionCapabilitiesReceivedCallbackConnection.disconnect();
+                    for (auto& [id, entry] : mEntryList)
+                        entry->requestProperties();
+                });
+        }
+    }
+}
diff --git a/indra/newview/fsradar.h b/indra/newview/fsradar.h
index 35286c1e31..a3069839db 100644
--- a/indra/newview/fsradar.h
+++ b/indra/newview/fsradar.h
@@ -119,6 +119,8 @@ private:
     void radarAlertMsg(const LLUUID& agent_id, const LLAvatarName& av_name, std::string_view postMsg);
     void updateAgeAlertCheck();
 
+    void onRegionChanged();
+
     std::unique_ptr<Updater> mRadarListUpdater;
 
     struct RadarFields
@@ -150,6 +152,9 @@ private:
     boost::signals2::connection mShowUsernamesCallbackConnection;
     boost::signals2::connection mNameFormatCallbackConnection;
     boost::signals2::connection mAgeAlertCallbackConnection;
+
+    boost::signals2::connection mRegionCapabilitiesReceivedCallbackConnection;
+    boost::signals2::connection mRegionChangedCallbackConnection;
 };
 
 #endif // FS_RADAR_H
diff --git a/indra/newview/fsradarentry.cpp b/indra/newview/fsradarentry.cpp
index 5bcd028769..d4fe667f8e 100644
--- a/indra/newview/fsradarentry.cpp
+++ b/indra/newview/fsradarentry.cpp
@@ -55,85 +55,10 @@ FSRadarEntry::FSRadarEntry(const LLUUID& avid)
     mNotes(LLStringUtil::null),
     mAlertAge(false),
     mAgeAlertPerformed(false),
-    mAvatarNameCallbackConnection(),
-    mRegionCapabilitiesReceivedCallbackConnection(),
-    mRegionChangedCallbackConnection()
+    mPropertiesRequested(false),
+    mAvatarNameCallbackConnection()
 {
-    if (mID.notNull())
-    {
-        // NOTE: typically we request these once on creation to avoid excess traffic/processing.
-        //This means updates to these properties won't typically be seen while target is in nearby range.
-        LLAvatarPropertiesProcessor* processor = LLAvatarPropertiesProcessor::getInstance();
-        processor->addObserver(mID, this);
-
-        if (auto region = gAgent.getRegion(); region)
-        {
-            if (region->capabilitiesReceived())
-            {
-                if (LLGridManager::instance().isInSecondLife() || region->isCapabilityAvailable(CAPNAME))
-                {
-                    processor->sendAvatarPropertiesRequest(mID);
-                }
-                else
-                {
-                    processor->sendAvatarLegacyPropertiesRequest(mID);
-                    processor->sendAvatarNotesRequest(mID);
-                }
-            }
-            else
-            {
-                auto capsReceivedCb = [this](const LLUUID&, LLViewerRegion* reg)
-                    {
-                        if (mRegionCapabilitiesReceivedCallbackConnection.connected())
-                        {
-                            mRegionCapabilitiesReceivedCallbackConnection.disconnect();
-                        }
-                        gAgent.removeRegionChangedCallback(mRegionChangedCallbackConnection);
-                        if (LLGridManager::instance().isInSecondLife() || (reg && reg->isCapabilityAvailable(CAPNAME)))
-                        {
-                            LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mID);
-                        }
-                        else
-                        {
-                            LLAvatarPropertiesProcessor::getInstance()->sendAvatarLegacyPropertiesRequest(mID);
-                            LLAvatarPropertiesProcessor::getInstance()->sendAvatarNotesRequest(mID);
-                        }
-                    };
-
-                mRegionChangedCallbackConnection = gAgent.addRegionChangedCallback([this, capsReceivedCb]()
-                    {
-                        if (mRegionCapabilitiesReceivedCallbackConnection.connected())
-                        {
-                            mRegionCapabilitiesReceivedCallbackConnection.disconnect();
-                        }
-
-                        if (auto newregion = gAgent.getRegion(); newregion)
-                        {
-                            if (newregion->capabilitiesReceived())
-                            {
-                                gAgent.removeRegionChangedCallback(mRegionChangedCallbackConnection);
-                                if (LLGridManager::instance().isInSecondLife() || newregion->isCapabilityAvailable(CAPNAME))
-                                {
-                                    LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mID);
-                                }
-                                else
-                                {
-                                    LLAvatarPropertiesProcessor::getInstance()->sendAvatarLegacyPropertiesRequest(mID);
-                                    LLAvatarPropertiesProcessor::getInstance()->sendAvatarNotesRequest(mID);
-                                }
-                            }
-                            else
-                            {
-                                mRegionCapabilitiesReceivedCallbackConnection = newregion->setCapabilitiesReceivedCallback(capsReceivedCb);
-                            }
-                        }
-                    });
-
-                mRegionCapabilitiesReceivedCallbackConnection = region->setCapabilitiesReceivedCallback(capsReceivedCb);
-            }
-        }
-    }
-
+    requestProperties();
     updateName();
 }
 
@@ -147,11 +72,34 @@ FSRadarEntry::~FSRadarEntry()
     {
         mAvatarNameCallbackConnection.disconnect();
     }
-    if (mRegionCapabilitiesReceivedCallbackConnection.connected())
+}
+
+void FSRadarEntry::requestProperties()
+{
+    if (!mPropertiesRequested && mID.notNull())
     {
-        mRegionCapabilitiesReceivedCallbackConnection.disconnect();
+        // NOTE: typically we request these once on creation to avoid excess traffic/processing.
+        //This means updates to these properties won't typically be seen while target is in nearby range.
+        LLAvatarPropertiesProcessor* processor = LLAvatarPropertiesProcessor::getInstance();
+        processor->addObserver(mID, this);
+
+        if (auto region = gAgent.getRegion())
+        {
+            if (region->capabilitiesReceived())
+            {
+                if (LLGridManager::instance().isInSecondLife() || region->isCapabilityAvailable(CAPNAME))
+                {
+                    processor->sendAvatarPropertiesRequest(mID);
+                }
+                else
+                {
+                    processor->sendAvatarLegacyPropertiesRequest(mID);
+                    processor->sendAvatarNotesRequest(mID);
+                }
+                mPropertiesRequested = true;
+            }
+        }
     }
-    gAgent.removeRegionChangedCallback(mRegionChangedCallbackConnection);
 }
 
 void FSRadarEntry::updateName()
diff --git a/indra/newview/fsradarentry.h b/indra/newview/fsradarentry.h
index 7c801d4b35..0cd9937a4d 100644
--- a/indra/newview/fsradarentry.h
+++ b/indra/newview/fsradarentry.h
@@ -68,6 +68,7 @@ public:
 private:
     void updateName();
     void onAvatarNameCache(const LLUUID& av_id, const LLAvatarName& av_name);
+    void requestProperties();
     void processProperties(void* data, EAvatarProcessorType type);
 
     LLUUID      mID;
@@ -87,10 +88,9 @@ private:
     bool        mIgnore;
     bool        mAlertAge;
     bool        mAgeAlertPerformed;
+    bool        mPropertiesRequested;
 
     LLAvatarNameCache::callback_connection_t mAvatarNameCallbackConnection;
-    boost::signals2::connection mRegionCapabilitiesReceivedCallbackConnection;
-    boost::signals2::connection mRegionChangedCallbackConnection;
 };
 
 #endif // FS_RADARENTRY_H

From 29811637a44e35f549f8da4871d253f7caec3e36 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 25 May 2024 14:07:22 +0200
Subject: [PATCH 06/42] Fix access violation crash in LLVOCache

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

diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 994b2870ef..32b614d596 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -1929,13 +1929,13 @@ void LLVOCache::removeGenericExtrasForHandle(U64 handle)
     auto* entry = mHandleEntryMap[handle];
     if (entry)
     {
+        LL_WARNS("GLTF", "VOCache") << "Removing generic extras for handle " << entry->mHandle << "Filename: " << getObjectCacheExtrasFilename(handle) << LL_ENDL;
         removeEntry(entry);
     }
     else
     {
         //shouldn't happen, but if it does, we should remove the extras file since it's orphaned
-        LL_WARNS("GLTF", "VOCache") << "Removing generic extras for handle " << entry->mHandle << "Filename: " << getObjectCacheExtrasFilename(handle) << LL_ENDL;
-        LLFile::remove(getObjectCacheExtrasFilename(entry->mHandle));
+        LLFile::remove(getObjectCacheExtrasFilename(handle));
     }
 }
 // </FS:Beq>

From a0367b968e602f1b9721073a14eb3fce08b9a455 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sun, 26 May 2024 01:37:30 +0100
Subject: [PATCH 07/42] Add AV White list helper

Initial version, text may need cleaning up based on support experience
wiki page can be adjusted to use the new floater to better guide actions.
---
 indra/newview/CMakeLists.txt                  |  6 ++
 indra/newview/fsfloaterwhitelisthelper.cpp    | 75 +++++++++++++++++++
 indra/newview/fsfloaterwhitelisthelper.h      | 17 +++++
 indra/newview/llviewerfloaterreg.cpp          |  3 +
 .../default/xui/en/floater_whitelist.xml      | 74 ++++++++++++++++++
 .../skins/default/xui/en/menu_viewer.xml      |  7 ++
 6 files changed, 182 insertions(+)
 create mode 100644 indra/newview/fsfloaterwhitelisthelper.cpp
 create mode 100644 indra/newview/fsfloaterwhitelisthelper.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_whitelist.xml

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index ad6219ed84..151298cca6 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -184,6 +184,9 @@ set(viewer_SOURCE_FILES
     vjfloaterlocalmesh.cpp
     vjlocalmeshimportdae.cpp
 
+    # Whitelist helper
+    fsfloaterwhitelisthelper.cpp
+
     llaccountingcostmanager.cpp
     llaisapi.cpp
     llagent.cpp
@@ -978,6 +981,9 @@ set(viewer_HEADER_FILES
     vjfloaterlocalmesh.h
     vjlocalmeshimportdae.h
 
+    # whitelist helper
+    fsfloaterwhitelisthelper.h
+
     llaccountingcostmanager.h
     llaisapi.h
     llagent.h
diff --git a/indra/newview/fsfloaterwhitelisthelper.cpp b/indra/newview/fsfloaterwhitelisthelper.cpp
new file mode 100644
index 0000000000..29b15e9524
--- /dev/null
+++ b/indra/newview/fsfloaterwhitelisthelper.cpp
@@ -0,0 +1,75 @@
+#include "fsfloaterwhitelisthelper.h"
+#include "lltextbox.h"
+#include "lltexteditor.h"
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+#include "lldir.h"
+
+
+FSFloaterWhiteListHelper::FSFloaterWhiteListHelper(const LLSD& key) : LLFloater(key)
+{
+}
+
+FSFloaterWhiteListHelper::~FSFloaterWhiteListHelper()=default;
+
+BOOL FSFloaterWhiteListHelper::postBuild()
+{
+    LLTextEditor* text_editor = getChild<LLTextEditor>("whitelist_text");
+    if (text_editor)
+    {
+        populateWhitelistInfo();
+    }
+    return TRUE;
+}
+
+void FSFloaterWhiteListHelper::populateWhitelistInfo()
+{
+// Hopefully we can trash this bit soon in favor of webRTC
+#if LL_WINDOWS
+    // On windows use exe (not work or RO) directory
+    std::string voiceexe_path = gDirUtilp->getExecutableDir();
+    gDirUtilp->append(voiceexe_path, "SLVoice.exe");
+#elif LL_DARWIN
+    // On MAC use resource directory
+    std::string voiceexe_path = gDirUtilp->getAppRODataDir();
+    gDirUtilp->append(voiceexe_path, "SLVoice");
+#else
+    std::string voiceexe_path = gDirUtilp->getExecutableDir();
+    bool usingWine = gSavedSettings.getBOOL("FSLinuxEnableWin64VoiceProxy");
+    if (!usingWine)
+    {
+        gDirUtilp->append(voiceexe_path, "SLVoice"); // native version
+    }
+    else
+    {
+        gDirUtilp->append(voiceexe_path, "win64/SLVoice.exe"); // use bundled win64 version
+    }
+#endif
+
+    const std::string& slpluginexe_path = gDirUtilp->getLLPluginLauncher();
+
+    std::string whitelist_folder_info = 
+        gDirUtilp->getExecutableDir() + "\n" // Executable Dir
+        + gDirUtilp->getOSUserAppDir() + "\n" // Top-level User Data Dir
+        + gDirUtilp->getCacheDir(); // "Cache Dir
+
+    std::string whitelist_exe_info = 
+        gDirUtilp->getExecutableFilename() + "\n" // Viewer Binary
+        + gDirUtilp->getExecutablePathAndName() + "\n" // Viewer Binary full path
+        + gDirUtilp->getBaseFileName(voiceexe_path, false) + "\n" // " Voice Binary"
+        + voiceexe_path + "\n" // slvoice full path
+        + gDirUtilp->getBaseFileName(slpluginexe_path, false) + "\n" // SLPlugin Launcher Binary
+        + slpluginexe_path + "\n"; // SLPlugin Launcher full path
+
+    LLTextEditor* text_editor = getChild<LLTextEditor>("whitelist_folders_editor");
+    if (text_editor)
+    {
+        text_editor->setText(whitelist_folder_info);
+    }
+
+    text_editor = getChild<LLTextEditor>("whitelist_exes_editor");
+    if (text_editor)
+    {
+        text_editor->setText(whitelist_exe_info);
+    }
+}
diff --git a/indra/newview/fsfloaterwhitelisthelper.h b/indra/newview/fsfloaterwhitelisthelper.h
new file mode 100644
index 0000000000..83dec8b14d
--- /dev/null
+++ b/indra/newview/fsfloaterwhitelisthelper.h
@@ -0,0 +1,17 @@
+#ifndef FSFLOATERWHITELISTHELPER_H
+#define FSFLOATERWHITELISTHELPER_H
+
+#include "llfloater.h"
+
+class FSFloaterWhiteListHelper : public LLFloater
+{
+public:
+    explicit FSFloaterWhiteListHelper(const LLSD& key);
+    ~FSFloaterWhiteListHelper() final;
+    public:
+    BOOL postBuild() final;
+
+private:
+    void populateWhitelistInfo();
+};
+#endif // FSFLOATERWHITELISTHELPER_H
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index bdbd53b7df..0674ba4f9c 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -229,6 +229,7 @@
 #include "particleeditor.h"
 #include "quickprefs.h"
 #include "vjfloaterlocalmesh.h" // local mesh
+#include "fsfloaterwhitelisthelper.h" // fs whitelist helper
 
 
 // handle secondlife:///app/openfloater/{NAME} URLs
@@ -649,6 +650,8 @@ void LLViewerFloaterReg::registerFloaters()
     LLFloaterReg::add("sound_explorer", "floater_NACL_explore_sounds.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<NACLFloaterExploreSounds>);
     LLFloaterReg::add("vram_usage", "floater_fs_vram_usage.xml", static_cast<LLFloaterBuildFunc>(&LLFloaterReg::build<FSFloaterVRAMUsage>));
     LLFloaterReg::add("local_mesh_floater", "floater_vj_local_mesh.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLocalMesh>); // local mesh
+    LLFloaterReg::add("fs_whitelist_floater", "floater_whitelist.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterWhiteListHelper>); // white list advisor
+
 
     LLFloaterReg::registerControlVariables(); // Make sure visibility and rect controls get preserved when saving
 }
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist.xml b/indra/newview/skins/default/xui/en/floater_whitelist.xml
new file mode 100644
index 0000000000..09f0d37b10
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_whitelist.xml
@@ -0,0 +1,74 @@
+<floater name="whitelist_floater"
+     title="Whitelist Folders and Binaries"
+     width="700"
+     height="470"
+     can_minimize="true"
+     can_resize="false">
+     <text
+          follows="top|left|right"
+          font="SansSerif"
+          height="120"
+          layout="topleft"
+          left="11"
+          name="whitelist_intro"
+          top="16"
+          width="689"
+          wrap="true">
+Anti-virus and Anti-malware are an essential part of safe internet use, but they can cause a variety of issues for the viewer.
+To reduce interference and improve stability and performance, we strongly advise that all users ensure that there are exclusions (known as Whitelisting) for important folders and programs that the viewer uses. 
+
+For more detailed information, visit
+https://wiki.firestormviewer.org/antivirus_whitelisting
+     
+     </text>         
+     <text
+          follows="top|left|right"
+          font="SansSerif"
+          height="35"
+          layout="topleft"
+          left="11"
+          name="whitelist_folder_instruction"
+          top_pad="10"
+          width="689"
+          wrap="true">
+To help simpify the task the box below shows the folders the viewer is using. 
+Please add these to your AV folder exclusions as shown on the above wiki page.
+     </text>         
+     <text_editor
+          parse_urls="true"
+          follows="top|left|right|bottom"
+          font="SansSerif"
+          height="100"
+          bg_readonly_color="Transparent"
+          left="5"
+          max_length="65536"
+          name="whitelist_folders_editor"
+          top_pad="5"
+          width="689"
+          word_wrap="true" />
+     <text
+          follows="top|left|right"
+          font="SansSerif"
+          height="35"
+          layout="topleft"
+          left="11"
+          name="whitelist_exe_instruction"
+          top_pad="5"
+          width="689"
+          wrap="true">
+The following box is the name and full path of the viewer executables. 
+Add these to you AV executable exclusions as shown in the above wiki.
+     </text>         
+     <text_editor
+          parse_urls="true"
+          follows="top|left|right|bottom"
+          font="SansSerif"
+          height="130"
+          bg_readonly_color="Transparent"
+          left="5"
+          max_length="65536"
+          name="whitelist_exes_editor"
+          top_pad="5"
+          width="689"
+          word_wrap="true" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1e66bd8eeb..376ae1ac99 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2642,6 +2642,13 @@
                  parameter="http://community.secondlife.com/t5/Blogs/ct-p/Blogs"/>
         </menu_item_call>-->
         <menu_item_separator/>
+        <menu_item_call
+            name="whitelist_folders"
+            label="Whitelist adviser">
+            <menu_item_call.on_click
+               function="Floater.Show"
+               parameter="fs_whitelist_floater" />
+        </menu_item_call>
         <menu_item_check
              label="Check Grid status"
              name="Grid Status">

From 79cf14a979566a82bb1060248e9a21feb16c74ce Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 26 May 2024 11:27:20 +0200
Subject: [PATCH 08/42] Clean up FSFloaterWhiteListHelper

---
 indra/newview/CMakeLists.txt               | 12 +----
 indra/newview/fsfloaterwhitelisthelper.cpp | 54 +++++++++++++---------
 indra/newview/fsfloaterwhitelisthelper.h   | 31 ++++++++++++-
 3 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 151298cca6..54b9fa09be 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -138,6 +138,7 @@ set(viewer_SOURCE_FILES
     fsfloatervolumecontrols.cpp
     fsfloatervramusage.cpp
     fsfloaterwearablefavorites.cpp
+    fsfloaterwhitelisthelper.cpp
     fskeywords.cpp
     fslslbridge.cpp
     fslslbridgerequest.cpp
@@ -178,15 +179,10 @@ set(viewer_SOURCE_FILES
     llpanelopenregionsettings.cpp
     # <FS:Ansariel> [Legacy Bake]
     llagentwearablesfetch.cpp
-
-    # local mesh
     vjlocalmesh.cpp
     vjfloaterlocalmesh.cpp
     vjlocalmeshimportdae.cpp
 
-    # Whitelist helper
-    fsfloaterwhitelisthelper.cpp
-
     llaccountingcostmanager.cpp
     llaisapi.cpp
     llagent.cpp
@@ -933,6 +929,7 @@ set(viewer_HEADER_FILES
     fsfloatervolumecontrols.h
     fsfloatervramusage.h
     fsfloaterwearablefavorites.h
+    fsfloaterwhitelisthelper.h
     fsgridhandler.h
     fskeywords.h
     fslslbridge.h
@@ -975,15 +972,10 @@ set(viewer_HEADER_FILES
     llfloaterflickr.h
     # <FS:Ansariel> [Legacy Bake]
     llagentwearablesfetch.h
-
-    # local mesh
     vjlocalmesh.h
     vjfloaterlocalmesh.h
     vjlocalmeshimportdae.h
 
-    # whitelist helper
-    fsfloaterwhitelisthelper.h
-
     llaccountingcostmanager.h
     llaisapi.h
     llagent.h
diff --git a/indra/newview/fsfloaterwhitelisthelper.cpp b/indra/newview/fsfloaterwhitelisthelper.cpp
index 29b15e9524..09b82b068c 100644
--- a/indra/newview/fsfloaterwhitelisthelper.cpp
+++ b/indra/newview/fsfloaterwhitelisthelper.cpp
@@ -1,7 +1,34 @@
+/**
+ * @file fsfloaterwhitelisthelper.cpp
+ * @brief Helper tool implementation to display paths to whitelist in antivirus tools
+ *
+ * $LicenseInfo:firstyear=2024&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2024, The Phoenix Firestorm Project, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
 #include "fsfloaterwhitelisthelper.h"
-#include "lltextbox.h"
 #include "lltexteditor.h"
-#include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #include "lldir.h"
 
@@ -10,15 +37,9 @@ FSFloaterWhiteListHelper::FSFloaterWhiteListHelper(const LLSD& key) : LLFloater(
 {
 }
 
-FSFloaterWhiteListHelper::~FSFloaterWhiteListHelper()=default;
-
 BOOL FSFloaterWhiteListHelper::postBuild()
 {
-    LLTextEditor* text_editor = getChild<LLTextEditor>("whitelist_text");
-    if (text_editor)
-    {
-        populateWhitelistInfo();
-    }
+    populateWhitelistInfo();
     return TRUE;
 }
 
@@ -46,7 +67,7 @@ void FSFloaterWhiteListHelper::populateWhitelistInfo()
     }
 #endif
 
-    const std::string& slpluginexe_path = gDirUtilp->getLLPluginLauncher();
+    const std::string slpluginexe_path = gDirUtilp->getLLPluginLauncher();
 
     std::string whitelist_folder_info = 
         gDirUtilp->getExecutableDir() + "\n" // Executable Dir
@@ -61,15 +82,6 @@ void FSFloaterWhiteListHelper::populateWhitelistInfo()
         + gDirUtilp->getBaseFileName(slpluginexe_path, false) + "\n" // SLPlugin Launcher Binary
         + slpluginexe_path + "\n"; // SLPlugin Launcher full path
 
-    LLTextEditor* text_editor = getChild<LLTextEditor>("whitelist_folders_editor");
-    if (text_editor)
-    {
-        text_editor->setText(whitelist_folder_info);
-    }
-
-    text_editor = getChild<LLTextEditor>("whitelist_exes_editor");
-    if (text_editor)
-    {
-        text_editor->setText(whitelist_exe_info);
-    }
+    getChild<LLTextEditor>("whitelist_folders_editor")->setText(whitelist_folder_info);
+    getChild<LLTextEditor>("whitelist_exes_editor")->setText(whitelist_exe_info);
 }
diff --git a/indra/newview/fsfloaterwhitelisthelper.h b/indra/newview/fsfloaterwhitelisthelper.h
index 83dec8b14d..7d09e14dd2 100644
--- a/indra/newview/fsfloaterwhitelisthelper.h
+++ b/indra/newview/fsfloaterwhitelisthelper.h
@@ -1,3 +1,30 @@
+/**
+ * @file fsfloaterwhitelisthelper.h
+ * @brief Helper tool header file to display paths to whitelist in antivirus tools
+ *
+ * $LicenseInfo:firstyear=2024&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2024, The Phoenix Firestorm Project, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
 #ifndef FSFLOATERWHITELISTHELPER_H
 #define FSFLOATERWHITELISTHELPER_H
 
@@ -7,8 +34,8 @@ class FSFloaterWhiteListHelper : public LLFloater
 {
 public:
     explicit FSFloaterWhiteListHelper(const LLSD& key);
-    ~FSFloaterWhiteListHelper() final;
-    public:
+    ~FSFloaterWhiteListHelper() final = default;
+
     BOOL postBuild() final;
 
 private:

From 2f182ebbb4deb8b4559027be54af3b432777cc8c Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 26 May 2024 11:28:18 +0200
Subject: [PATCH 09/42] Update German translation

---
 .../skins/default/xui/de/floater_whitelist.xml  | 17 +++++++++++++++++
 .../skins/default/xui/de/menu_viewer.xml        |  1 +
 .../skins/default/xui/en/floater_whitelist.xml  | 10 +++++-----
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_whitelist.xml

diff --git a/indra/newview/skins/default/xui/de/floater_whitelist.xml b/indra/newview/skins/default/xui/de/floater_whitelist.xml
new file mode 100644
index 0000000000..62972ce2a1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_whitelist.xml
@@ -0,0 +1,17 @@
+<floater name="whitelist_floater" title="Whitelist für Verzeichnnisse und Dateien">
+	<text name="whitelist_intro">
+		Anti-Virus- und Anti-Malware-Software sind essenziell für die sichere Nutzung des Internet, können aber eine Vielzahl an Problem für den Viewer erzeugen.
+Um die Beinträchtigung zu minimieren und Stabilität und Performance zu erhöhen, raten wir daher eingehend alle Benutzer Ausnahmen (auch bekannt als Whitelisting) für wichtige Verzeichnisse und Programme einzurichten, die vom Viewer verwendet werden.
+
+Weitere Details hierzu finden Sie unter
+https://wiki.firestormviewer.org/antivirus_whitelisting
+	</text>
+	<text name="whitelist_folder_instruction">
+		Das folgende Textfeld die Verzeichnisse angezeigt, die vom Viewer verwendet werden.
+Bitte fügen Sie diese zu den Verzeichnis-Ausnahmen hinzu.
+	</text>
+	<text name="whitelist_exe_instruction">
+		Das folgende Textfeld zeigt die Namen und vollständigen Pfade der ausführbaren Dateien des Viewers an.
+Bitte fügen Sie diese zu den Ausnahmen für ausführbare Dateien hinzu hinzu.
+	</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 1964ad640c..625d4c3485 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -283,6 +283,7 @@
 		<menu_item_check label="Anweisungen..." name="How To"/>
 		<menu_item_call label="[CURRENT_GRID]-Hilfe" name="current_grid_help"/>
 		<menu_item_call label="Über [CURRENT_GRID]" name="current_grid_about"/>
+		<menu_item_call label="Whitelist-Unterstützung" name="whitelist_folders"/>
 		<menu_item_call label="Grid-Status prüfen" name="Grid Status"/>
 		<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
 		<menu_item_call label="Problem melden" name="Report Bug"/>
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist.xml b/indra/newview/skins/default/xui/en/floater_whitelist.xml
index 09f0d37b10..ea9df85c16 100644
--- a/indra/newview/skins/default/xui/en/floater_whitelist.xml
+++ b/indra/newview/skins/default/xui/en/floater_whitelist.xml
@@ -14,13 +14,13 @@
           top="16"
           width="689"
           wrap="true">
-Anti-virus and Anti-malware are an essential part of safe internet use, but they can cause a variety of issues for the viewer.
+Anti-virus and Anti-malware are an essential part of safe Internet use, but they can cause a variety of issues for the viewer.
 To reduce interference and improve stability and performance, we strongly advise that all users ensure that there are exclusions (known as Whitelisting) for important folders and programs that the viewer uses. 
 
 For more detailed information, visit
 https://wiki.firestormviewer.org/antivirus_whitelisting
      
-     </text>         
+     </text>
      <text
           follows="top|left|right"
           font="SansSerif"
@@ -31,9 +31,9 @@ https://wiki.firestormviewer.org/antivirus_whitelisting
           top_pad="10"
           width="689"
           wrap="true">
-To help simpify the task the box below shows the folders the viewer is using. 
+To help simplify the task the box below shows the folders the viewer is using. 
 Please add these to your AV folder exclusions as shown on the above wiki page.
-     </text>         
+     </text>
      <text_editor
           parse_urls="true"
           follows="top|left|right|bottom"
@@ -58,7 +58,7 @@ Please add these to your AV folder exclusions as shown on the above wiki page.
           wrap="true">
 The following box is the name and full path of the viewer executables. 
 Add these to you AV executable exclusions as shown in the above wiki.
-     </text>         
+     </text>
      <text_editor
           parse_urls="true"
           follows="top|left|right|bottom"

From 5751bffe3ca345e5e71d221ed899d6f21f533581 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 26 May 2024 11:29:37 +0200
Subject: [PATCH 10/42] Just use override too...

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

diff --git a/indra/newview/fsfloaterwhitelisthelper.h b/indra/newview/fsfloaterwhitelisthelper.h
index 7d09e14dd2..6fe4f976e7 100644
--- a/indra/newview/fsfloaterwhitelisthelper.h
+++ b/indra/newview/fsfloaterwhitelisthelper.h
@@ -36,7 +36,7 @@ public:
     explicit FSFloaterWhiteListHelper(const LLSD& key);
     ~FSFloaterWhiteListHelper() final = default;
 
-    BOOL postBuild() final;
+    BOOL postBuild() override final;
 
 private:
     void populateWhitelistInfo();

From 2c169335a421cc8ce8fd03b3573cb4f730c78d1b Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 26 May 2024 21:09:56 +0200
Subject: [PATCH 11/42] Updated Polish translation

---
 .../default/xui/pl/floater_whitelist.xml      |  17 +++
 .../skins/default/xui/pl/menu_viewer.xml      |   1 +
 .../default/xui/pl/sidepanel_task_info.xml    | 120 +++++++++---------
 .../xui/pl/panel_group_info_sidetray.xml      |   9 ++
 .../xui/pl/panel_group_info_sidetray.xml      |   9 ++
 5 files changed, 96 insertions(+), 60 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/pl/floater_whitelist.xml

diff --git a/indra/newview/skins/default/xui/pl/floater_whitelist.xml b/indra/newview/skins/default/xui/pl/floater_whitelist.xml
new file mode 100644
index 0000000000..3225ede113
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_whitelist.xml
@@ -0,0 +1,17 @@
+<floater name="whitelist_floater" title="Dodaj foldery i pliki binarne do wykluczeń">
+	<text name="whitelist_intro">
+		Antywirusy i oprogramowanie chroniące przed złośliwym oprogramowaniem są istotnym elementem bezpiecznego korzystania z Internetu, ale mogą powodować wiele problemów.
+Aby poprawić stabilność i wydajność zdecydowanie zalecamy, aby wszyscy użytkownicy upewnili się, że dodali do wykluczeń (tzw. białej listy) ważne foldery i programy używane przez przeglądarkę.
+
+Więcej szczegółowych informacji znajdziesz na stronie
+https://wiki.firestormviewer.org/antivirus_whitelisting
+	</text>
+	<text name="whitelist_folder_instruction">
+		Aby uprościć zadanie, w polu poniżej znajdują się foldery używane przez przeglądarkę.
+Dodaj je do wykluczeń antywirusa, jak pokazano na stronie wiki powyżej.
+	</text>
+	<text name="whitelist_exe_instruction">
+		Poniższe pole zawiera nazwy i ścieżki plików wykonywalnych przeglądarki.
+Dodaj je do wykluczeń antywirusa, jak pokazano na stronie wiki powyżej.
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 0d62b2bbcf..40a5a646d4 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -298,6 +298,7 @@
 		<menu_item_call label="Portal wsparcia" name="Support portal"/>
 		<menu_item_call label="Newsy: [SECOND_LIFE]" name="Second Life News"/>
 		<menu_item_call label="Blogi: [SECOND_LIFE]" name="Second Life Blogs"/> -->
+		<menu_item_call name="whitelist_folders" label="Doradca wykluczeń" />
 		<menu_item_check label="Sprawdź stan świata" name="Grid Status"/>
 		<menu_item_call label="Zgłoś nadużycie" name="Report Abuse"/>
 		<menu_item_call label="Zgłoś problem" name="Report Bug"/>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
index 2014c1bed1..cad9d4e6da 100644
--- a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
@@ -45,72 +45,72 @@
 	<text name="title" value="Profil obiektu"/>
 	<text name="where" value="(W świecie)"/>
 	<scroll_container name="item_profile_scroll">
-	<panel name="properties_panel">
-		<text name="Name:">
-			Nazwa:
-		</text>
-		<line_editor name="Object Name" tool_tip="Nazwa jest ograniczona do 63 znaków. Dłuższe nazwy prim są skracane. Nazwy mogą składać się tylko z widocznych znaków znajdujących się w zestawie ASCII-7 (bez rozszerzenia), z wyjątkiem pionowej kreski &apos;|&apos;." />
-		<text name="Description:">
-			Opis:
-		</text>
-		<line_editor name="Object Description" tool_tip="Kiedy ludzie mają &apos;Pokaż chmurki pomocy na wszystkich obiektach&apos; włączone w ustawieniach przeglądarki, to zobaczą wyskakujący opis obiektu dla dowolnego obiektu pod ich wskaźnikiem myszy. Opis primy jest ograniczony do 127 bajtów, ciąg znaków dłuższy niż ten limit zostanie obcięty." />
-		<text name="CreatorNameLabel">
-			Twórca:
-		</text>
-		<text name="Owner:">
-			Właściciel:
-		</text>
-		<text name="Group_label">
-			Grupa:
-		</text>
-		<button name="button set group" tool_tip="Wybierz grupę by udostępnić jej prawa do tego obiektu"/>
-		<name_box initial_value="Ładowanie..." name="Group Name Proxy"/>
-		<button label="Przypisz" label_selected="Przypisz" name="button deed" tool_tip="Opcja przypisania udostępnia obiektowi takie same prawa jak zostały zaznaczone dla następnego właściciela. Obiekty udostępnione grupie mogą zostać przypisane dla grupy przez oficera grupy."/>
-		<text name="label click action">
-			Po kliku:
-		</text>
-		<combo_box name="clickaction" tool_tip="Akcja po kliku umożliwia interakcję z obiektem jednym kliknięciem lewym przyciskiem myszy. Każda akcja ma specjalny kursor wskazujący, co robi. Niektóre działania związane z klikaniem mają pewne wymagania, aby zaczęły działać. Na przykład Dotknij i Zapłać wymagają skryptów.">
-			<combo_box.item label="Dotknij (domyślne)" name="Touch/grab(default)"/>
-			<combo_box.item label="Usiądź na obiekcie" name="Sitonobject"/>
-			<combo_box.item label="Kup obiekt" name="Buyobject"/>
-			<combo_box.item label="Zapłać obiektowi" name="Payobject"/>
-			<combo_box.item label="Otwórz" name="Open"/>
-			<combo_box.item label="Przybliż" name="Zoom"/>
-			<combo_box.item label="Brak" name="None"/>
-			<combo_box.item label="Ignoruj obiekt" name="Ignoreobject" />
-		</combo_box>
-		<panel name="perms_inv">
-			<text name="perm_modify">
-				Możesz modyfikować ten obiekt
+		<panel name="properties_panel">
+			<text name="Name:">
+				Nazwa:
 			</text>
-			<text name="Anyone can:">
-				Każdy:
+			<line_editor name="Object Name" tool_tip="Nazwa jest ograniczona do 63 znaków. Dłuższe nazwy prim są skracane. Nazwy mogą składać się tylko z widocznych znaków znajdujących się w zestawie ASCII-7 (bez rozszerzenia), z wyjątkiem pionowej kreski &apos;|&apos;." />
+			<text name="Description:">
+				Opis:
 			</text>
-			<check_box label="Kopiowanie" name="checkbox allow everyone copy" tool_tip="Każdy może wziąć kopię obiektu. Obiekt i cała jego zawartość muszą być kopiowalne i transferowalne." />
-			<check_box label="Przesuwanie" name="checkbox allow everyone move" tool_tip="Każdy może przesuwać obiekt." />
-			<text name="GroupLabel">
+			<line_editor name="Object Description" tool_tip="Kiedy ludzie mają &apos;Pokaż chmurki pomocy na wszystkich obiektach&apos; włączone w ustawieniach przeglądarki, to zobaczą wyskakujący opis obiektu dla dowolnego obiektu pod ich wskaźnikiem myszy. Opis primy jest ograniczony do 127 bajtów, ciąg znaków dłuższy niż ten limit zostanie obcięty." />
+			<text name="CreatorNameLabel">
+				Twórca:
+			</text>
+			<text name="Owner:">
+				Właściciel:
+			</text>
+			<text name="Group_label">
 				Grupa:
 			</text>
-			<check_box label="Udostępnij" name="checkbox share with group" tool_tip="Pozwól wszystkim osobom z ustawionej grupy na dzielenie prawa do modyfikacji dla tego obiektu. Musisz przypisać obiekt grupie aby aktywować ograniczenia wynikające z funkcji."/>
-			<text name="NextOwnerLabel">
-				Nast. właściciel:
+			<button name="button set group" tool_tip="Wybierz grupę by udostępnić jej prawa do tego obiektu"/>
+			<name_box initial_value="Ładowanie..." name="Group Name Proxy"/>
+			<button label="Przypisz" label_selected="Przypisz" name="button deed" tool_tip="Opcja przypisania udostępnia obiektowi takie same prawa jak zostały zaznaczone dla następnego właściciela. Obiekty udostępnione grupie mogą zostać przypisane dla grupy przez oficera grupy."/>
+			<text name="label click action">
+				Po kliku:
+			</text>
+			<combo_box name="clickaction" tool_tip="Akcja po kliku umożliwia interakcję z obiektem jednym kliknięciem lewym przyciskiem myszy. Każda akcja ma specjalny kursor wskazujący, co robi. Niektóre działania związane z klikaniem mają pewne wymagania, aby zaczęły działać. Na przykład Dotknij i Zapłać wymagają skryptów.">
+				<combo_box.item label="Dotknij (domyślne)" name="Touch/grab(default)"/>
+				<combo_box.item label="Usiądź na obiekcie" name="Sitonobject"/>
+				<combo_box.item label="Kup obiekt" name="Buyobject"/>
+				<combo_box.item label="Zapłać obiektowi" name="Payobject"/>
+				<combo_box.item label="Otwórz" name="Open"/>
+				<combo_box.item label="Przybliż" name="Zoom"/>
+				<combo_box.item label="Brak" name="None"/>
+				<combo_box.item label="Ignoruj obiekt" name="Ignoreobject" />
+			</combo_box>
+			<panel name="perms_inv">
+				<text name="perm_modify">
+					Możesz modyfikować ten obiekt
+				</text>
+				<text name="Anyone can:">
+					Każdy:
+				</text>
+				<check_box label="Kopiowanie" name="checkbox allow everyone copy" tool_tip="Każdy może wziąć kopię obiektu. Obiekt i cała jego zawartość muszą być kopiowalne i transferowalne." />
+				<check_box label="Przesuwanie" name="checkbox allow everyone move" tool_tip="Każdy może przesuwać obiekt." />
+				<text name="GroupLabel">
+					Grupa:
+				</text>
+				<check_box label="Udostępnij" name="checkbox share with group" tool_tip="Pozwól wszystkim osobom z ustawionej grupy na dzielenie prawa do modyfikacji dla tego obiektu. Musisz przypisać obiekt grupie aby aktywować ograniczenia wynikające z funkcji."/>
+				<text name="NextOwnerLabel">
+					Nast. właściciel:
+				</text>
+				<check_box label="Modyfikacja" name="checkbox next owner can modify" tool_tip="Następny właściciel może edytować właściwości, takie jak nazwa lub rozmiar tego obiektu." />
+				<check_box label="Kopiowanie" name="checkbox next owner can copy" tool_tip="Następny właściciel może wykonać nieograniczoną liczbę kopii tego obiektu. Kopie przechowują informacje o twórcy i nigdy nie mogą mieć większych zezwoleń niż kopiowany element." />
+				<check_box label="Transferowanie" name="checkbox next owner can transfer" tool_tip="Następny właściciel może sprzedać lub oddać ten obiekt." />
+			</panel>
+			<check_box label="Na sprzedaż" name="checkbox for sale" tool_tip="Pozwala ludziom kupować ten obiekt, jego zawartość lub kopię w świecie za określoną cenę." />
+			<combo_box name="sale type" tool_tip="Wybierz, czy kupujący otrzyma kopię przedmiotu, kopię samej zawartości przedmiotu lub oryginalny przedmiot w ogóle.">
+				<combo_box.item label="Kopia" name="Copy"/>
+				<combo_box.item label="Zawartość" name="Contents"/>
+				<combo_box.item label="Oryginał" name="Original"/>
+			</combo_box>
+			<spinner label="Cena: L$" name="Edit Cost" tool_tip="Koszt obiektu." />
+			<check_box label="Pokaż w wyszukiwarce" name="search_check" tool_tip="Udostępnij widzialność tego obiektu w wyszukiwarce"/>
+			<text name="pathfinding_attributes_label">
+				Atrybuty odnajd. ścieżek:
 			</text>
-			<check_box label="Modyfikacja" name="checkbox next owner can modify" tool_tip="Następny właściciel może edytować właściwości, takie jak nazwa lub rozmiar tego obiektu." />
-			<check_box label="Kopiowanie" name="checkbox next owner can copy" tool_tip="Następny właściciel może wykonać nieograniczoną liczbę kopii tego obiektu. Kopie przechowują informacje o twórcy i nigdy nie mogą mieć większych zezwoleń niż kopiowany element." />
-			<check_box label="Transferowanie" name="checkbox next owner can transfer" tool_tip="Następny właściciel może sprzedać lub oddać ten obiekt." />
 		</panel>
-		<check_box label="Na sprzedaż" name="checkbox for sale" tool_tip="Pozwala ludziom kupować ten obiekt, jego zawartość lub kopię w świecie za określoną cenę." />
-		<combo_box name="sale type" tool_tip="Wybierz, czy kupujący otrzyma kopię przedmiotu, kopię samej zawartości przedmiotu lub oryginalny przedmiot w ogóle.">
-			<combo_box.item label="Kopia" name="Copy"/>
-			<combo_box.item label="Zawartość" name="Contents"/>
-			<combo_box.item label="Oryginał" name="Original"/>
-		</combo_box>
-		<spinner label="Cena: L$" name="Edit Cost" tool_tip="Koszt obiektu." />
-		<check_box label="Pokaż w wyszukiwarce" name="search_check" tool_tip="Udostępnij widzialność tego obiektu w wyszukiwarce"/>
-		<text name="pathfinding_attributes_label">
-			Atrybuty odnajd. ścieżek:
-		</text>
-	</panel>
 	</scroll_container>
 	<layout_stack name="buttons_ls">
 		<layout_panel name="open_btn_panel">
diff --git a/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
index 138bebd695..c3416d3e21 100644
--- a/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
@@ -12,6 +12,15 @@
 	<panel.string name="group_join_free">
 		Darmowe
 	</panel.string>
+	<panel.string name="group_member">
+		Osoba
+	</panel.string>
+	<panel.string name="join_txt">
+		Dołącz
+	</panel.string>
+	<panel.string name="leave_txt">
+		Opuść
+	</panel.string>
 	<layout_stack name="group_info_sidetray_main">
 		<layout_panel name="header_container">
 			<panel name="group_info_top">
diff --git a/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
index 138bebd695..c3416d3e21 100644
--- a/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
@@ -12,6 +12,15 @@
 	<panel.string name="group_join_free">
 		Darmowe
 	</panel.string>
+	<panel.string name="group_member">
+		Osoba
+	</panel.string>
+	<panel.string name="join_txt">
+		Dołącz
+	</panel.string>
+	<panel.string name="leave_txt">
+		Opuść
+	</panel.string>
 	<layout_stack name="group_info_sidetray_main">
 		<layout_panel name="header_container">
 			<panel name="group_info_top">

From a119f96b908e329f779fa10a520434cbd27ef86c Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Mon, 27 May 2024 14:05:51 +0200
Subject: [PATCH 12/42] Vintage: add support for shortened avatar age display

---
 .../xui/en/panel_profile_secondlife.xml       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml
index 3a558429a8..63414627db 100644
--- a/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml
@@ -68,7 +68,11 @@
     name="no_group_text"
     value="None" />
   <string
-    name="age_format">
+    name="age_format_short">
+    Birthdate: [REG_DATE]
+  </string>
+  <string
+    name="age_format_full">
     Birthdate: [REG_DATE]
 ([AGE])
   </string>
@@ -763,6 +767,19 @@
     layout="topleft"
     visible="false" />
 
+  <check_box
+    name="hide_sl_age"
+    label="Show full birthdate"
+    tool_tip="Let people see your SL age"
+    enabled="false"
+    bottom="-28"
+    left="230"
+    height="16"
+    width="130"
+    follows="left|bottom"
+    layout="topleft"
+    visible="false" />
+
   <button
     name="save_description_changes"
     label="Save"

From 81df8a4e02426d0f1334084b668f10f08957bcff Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Mon, 27 May 2024 14:14:51 +0200
Subject: [PATCH 13/42] Apply Vintage profile floater changes to all supported
 translations

---
 .../skins/vintage/xui/fr/panel_profile_secondlife.xml       | 6 +++++-
 .../skins/vintage/xui/pl/panel_profile_secondlife.xml       | 6 +++++-
 .../skins/vintage/xui/ru/panel_profile_secondlife.xml       | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/vintage/xui/fr/panel_profile_secondlife.xml b/indra/newview/skins/vintage/xui/fr/panel_profile_secondlife.xml
index 283982d631..2a87a498a2 100644
--- a/indra/newview/skins/vintage/xui/fr/panel_profile_secondlife.xml
+++ b/indra/newview/skins/vintage/xui/fr/panel_profile_secondlife.xml
@@ -11,7 +11,10 @@
 	</string>
 	<string name="no_partner_text" value="Aucun" />
 	<string name="no_group_text" value="Aucun" />
-	<string name="age_format">
+	<string name="age_format_short">
+		Anniversaire : [REG_DATE]
+	</string>
+	<string name="age_format_full">
 Anniversaire : [REG_DATE]
 ([AGE])
 	</string>
@@ -66,6 +69,7 @@ Anniversaire : [REG_DATE]
 		</layout_panel>
 	</layout_stack>
 	<check_box name="show_in_search" label="Afficher dans la recherche" tool_tip="Laissez les autres vous voir dans les résultats de recherche" />
+	<check_box name="hide_sl_age" label="Afficher la date de naissance complète'" tool_tip="Laissez les gens voir votre âge SL"/>
 	<button name="save_description_changes" label="Enregistrer" />
 	<button name="discard_description_changes" label="Annuler" />
 </panel>
diff --git a/indra/newview/skins/vintage/xui/pl/panel_profile_secondlife.xml b/indra/newview/skins/vintage/xui/pl/panel_profile_secondlife.xml
index 4b60b7d35f..ba33a4fdeb 100644
--- a/indra/newview/skins/vintage/xui/pl/panel_profile_secondlife.xml
+++ b/indra/newview/skins/vintage/xui/pl/panel_profile_secondlife.xml
@@ -12,7 +12,10 @@
 	<string name="BadgeTeam" value="Zespół [APP_NAME]a" />
 	<string name="no_partner_text" value="Brak" />
 	<string name="no_group_text" value="Brak" />
-	<string name="age_format">
+	<string name="age_format_short">
+		Urodziny: [REG_DATE]
+	</string>
+	<string name="age_format_full">
 Urodziny: [REG_DATE]
 ([AGE])
 	</string>
@@ -66,6 +69,7 @@ Urodziny: [REG_DATE]
 		</layout_panel>
 	</layout_stack>
 	<check_box name="show_in_search" label="Pokaż w wyszukiwarce" tool_tip="Pozwól innym zobaczyć Cię w wynikach wyszukiwania" />
+	<check_box name="hide_sl_age" label="Pełna data urodzenia" tool_tip="Pozwól innym widzieć Twój wiek w SL" />
 	<button name="save_description_changes" label="Zapisz" />
 	<button name="discard_description_changes" label="Odrzuć" />
 </panel>
diff --git a/indra/newview/skins/vintage/xui/ru/panel_profile_secondlife.xml b/indra/newview/skins/vintage/xui/ru/panel_profile_secondlife.xml
index 96100cc00a..cfcc850be0 100644
--- a/indra/newview/skins/vintage/xui/ru/panel_profile_secondlife.xml
+++ b/indra/newview/skins/vintage/xui/ru/panel_profile_secondlife.xml
@@ -12,7 +12,10 @@
 	<string name="BadgeTeam" value="Член [APP_NAME]" />
 	<string name="no_partner_text" value="Нет" />
 	<string name="no_group_text" value="Нет" />
-	<string name="age_format">
+	<string name="age_format_short">
+		Возраст: [REG_DATE]
+	</string>
+	<string name="age_format_full">
 Возраст: [REG_DATE]
 ([AGE])
 	</string>
@@ -68,6 +71,7 @@
 		</layout_panel>
 	</layout_stack>
 	<check_box name="show_in_search" label="Показать в поиске" tool_tip="Пусть люди видят вас в результатах поиска"/>
+	<check_box name="hide_sl_age" label="Показать полную дату рождения" tool_tip="Позволить людям видеть ваш возраст в СЛ"/>
 	<button name="save_description_changes" label="Сохранить"/>
 	<button name="discard_description_changes" label="Отклонить"/>
 </panel>

From 51769ff70b87a00d1ec40f1e3108f201ad47ead5 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 27 May 2024 15:06:47 +0200
Subject: [PATCH 14/42] FIRE-33947: Fix objects can't be detached if attachment
 spot also contains locked attachments

---
 indra/newview/llviewermenu.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index e1d59fca20..2374e94cb4 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9115,13 +9115,10 @@ class LLAttachmentDetach : public view_listener_t
 
 // [RLVa:KB] - Checked: 2010-03-15 (RLVa-1.2.0a) | Modified: RLVa-1.0.5
                 // NOTE: copy/paste of the code in enable_detach()
-                if ((rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.hasLockedAttachmentPoint(RLV_LOCK_REMOVE)))
+                if ((rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.hasLockedAttachmentPoint(RLV_LOCK_REMOVE)) &&
+                    gRlvAttachmentLocks.isLockedAttachment(objectp->getRootEdit()))
                 {
-                    //LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
-                    //RlvSelectHasLockedAttach f;
-                    //if ((hSelect->isAttachment()) && (hSelect->getFirstRootNode(&f, FALSE) != NULL))
-                    //  return true;
-                    return !gRlvAttachmentLocks.isLockedAttachment(objectp->getRootEdit()); // <FS:Ansariel> Kitty will have to check this...
+                    return false;
                 }
 // [/RLVa:KB]
 

From 60620fd0143805d00d131ec6bdb6fc29d423eca8 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Mon, 27 May 2024 23:11:20 +0200
Subject: [PATCH 15/42] FIRE-33939: Activate button in Group Profile page

---
 indra/newview/llpanelgroup.cpp                | 50 +++++++++++++++++++
 indra/newview/llpanelgroup.h                  |  2 +
 .../xui/en/panel_group_info_sidetray.xml      | 32 +++++++++---
 .../xui/en/panel_group_info_sidetray.xml      | 32 +++++++++---
 .../xui/it/panel_group_info_sidetray.xml      |  2 +-
 .../xui/pl/panel_group_info_sidetray.xml      |  5 +-
 .../xui/en/panel_group_info_sidetray.xml      | 32 +++++++++---
 .../xui/en/panel_group_info_sidetray.xml      | 31 +++++++++---
 .../xui/en/panel_group_info_sidetray.xml      | 32 +++++++++---
 .../xui/pl/panel_group_info_sidetray.xml      |  3 ++
 .../xui/ru/panel_group_info_sidetray.xml      |  2 +-
 .../xui/en/panel_group_info_sidetray.xml      | 32 +++++++++---
 .../xui/pl/panel_group_info_sidetray.xml      |  3 ++
 .../xui/en/panel_group_info_sidetray.xml      | 31 +++++++++---
 14 files changed, 241 insertions(+), 48 deletions(-)

diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 208cc149f7..32c4c9aabe 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -232,6 +232,11 @@ BOOL LLPanelGroup::postBuild()
     button = getChild<LLButton>("btn_refresh");
     button->setClickedCallback(onBtnRefresh, this);
 
+    // <FS:PP> FIRE-33939: Activate button
+    button = getChild<LLButton>("btn_activate");
+    button->setClickedCallback(onBtnActivateClicked, this);
+    // <FS:PP>
+
     childSetCommitCallback("back",boost::bind(&LLPanelGroup::onBackBtnClick,this),NULL);
 
     LLPanelGroupTab* panel_general = findChild<LLPanelGroupTab>("group_general_tab_panel");
@@ -296,6 +301,7 @@ void LLPanelGroup::reposButtons()
     reposButton("btn_cancel");
     reposButton("btn_chat");
     reposButton("btn_call");
+    reposButton("btn_activate"); // <FS:PP> FIRE-33939: Activate button
 }
 
 void LLPanelGroup::reshape(S32 width, S32 height, BOOL called_from_parent )
@@ -347,6 +353,15 @@ void LLPanelGroup::onBtnGroupChatClicked(void* user_data)
     self->chatGroup();
 }
 
+// <FS:PP> FIRE-33939: Activate button
+void LLPanelGroup::onBtnActivateClicked(void* user_data)
+{
+    LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
+    self->activateGroup();
+    self->refreshData();
+}
+// </FS:PP>
+
 void LLPanelGroup::onBtnJoin()
 {
     if (LLGroupActions::isInGroup(mID))
@@ -486,6 +501,15 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
     if(button_chat)
             button_chat->setVisible(!is_null_group_id);
 
+    // <FS:PP> FIRE-33939: Activate button
+    LLButton* button_activate = findChild<LLButton>("btn_activate");
+    if (button_activate)
+    {
+        button_activate->setVisible(!is_null_group_id);
+        button_activate->setEnabled(group_id != gAgent.getGroupID());
+    }
+    // </FS:PP>
+
     getChild<LLUICtrl>("prepend_founded_by")->setVisible(!is_null_group_id);
 
     // <FS:Ansariel> TabContainer switch
@@ -566,6 +590,10 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
             button_call->setVisible(false);
         if(button_chat)
             button_chat->setVisible(false);
+        // <FS:PP> FIRE-33939: Activate button
+        if(button_activate)
+            button_activate->setVisible(false);
+        // </FS:PP>
     }
     else
     {
@@ -625,6 +653,10 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
             button_call->setVisible(is_member);
         if(button_chat)
             button_chat->setVisible(is_member);
+        // <FS:PP> FIRE-33939: Activate button
+        if(button_activate)
+            button_activate->setVisible(is_member);
+        // </FS:PP>
     }
 
     // <FS:Ansariel> TabContainer switch
@@ -710,6 +742,12 @@ void LLPanelGroup::draw()
         mRefreshTimer.stop();
         childEnable("btn_refresh");
         childEnable("groups_accordion");
+        // <FS:PP> FIRE-33939: Activate button
+        if (gAgent.getGroupID() != getID())
+        {
+            childEnable("btn_activate");
+        }
+        // </FS:PP>
     }
 
     LLButton* button_apply = findChild<LLButton>("btn_apply");
@@ -741,6 +779,7 @@ void LLPanelGroup::refreshData()
     // 5 second timeout
     childDisable("btn_refresh");
     childDisable("groups_accordion");
+    childDisable("btn_activate"); // <FS:PP> FIRE-33939: Activate button
 
     mRefreshTimer.start();
     mRefreshTimer.setTimerExpirySec(5);
@@ -756,6 +795,17 @@ void LLPanelGroup::chatGroup()
     LLGroupActions::startIM(getID());
 }
 
+// <FS:PP> FIRE-33939: Activate button
+void LLPanelGroup::activateGroup()
+{
+    LLUUID group_id = getID();
+    if (gAgent.getGroupID() != group_id)
+    {
+        LLGroupActions::activate(group_id);
+    }
+}
+// </FS:PP>
+
 void LLPanelGroup::showNotice(const std::string& subject,
                   const std::string& message,
                   const bool& has_inventory,
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index ac3a00dce7..998a598d4d 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -76,6 +76,7 @@ public:
     void refreshData();
     void callGroup();
     void chatGroup();
+    void activateGroup(); // <FS:PP> FIRE-33939: Activate button
 
     virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
@@ -102,6 +103,7 @@ protected:
     static void onBtnRefresh(void*);
     static void onBtnGroupCallClicked(void*);
     static void onBtnGroupChatClicked(void*);
+    static void onBtnActivateClicked(void*); // <FS:PP> FIRE-33939: Activate button
 
     void reposButton(const std::string& name);
     void reposButtons();
diff --git a/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml
index ae98e142b9..e30d500c06 100644
--- a/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml
@@ -219,6 +219,26 @@ background_visible="false"
 				     width="23" />
 				</layout_panel>
 
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_activate_lp"
+			    user_resize="false"
+			    auto_resize="true"
+				width="72">
+					<button
+			         layout="topleft"
+				     follows="bottom|left|right"
+				     label="Activate"
+				     name="btn_activate"
+				     left="1"
+				     height="23"
+				     top="0"
+				     width="71" />
+				</layout_panel>
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
@@ -227,7 +247,7 @@ background_visible="false"
 				name="btn_chat_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="97">
+				width="72">
 					<button
 			         layout="topleft"
 				     follows="bottom|left|right"
@@ -236,7 +256,7 @@ background_visible="false"
 				     left="1"
 				     height="23"
 				     top="0"
-				     width="96" />
+				     width="71" />
 				</layout_panel>
 
 				<layout_panel
@@ -247,7 +267,7 @@ background_visible="false"
 				name="call_btn_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="97">
+				width="72">
 					<button
 			         follows="bottom|left|right"
 			         left="1"
@@ -257,7 +277,7 @@ background_visible="false"
 			         layout="topleft"
 			         tool_tip="Call this group"
 			         top="0"
-			         width="96" />
+			         width="71" />
 				</layout_panel>
 
 				<layout_panel
@@ -268,7 +288,7 @@ background_visible="false"
 				name="btn_apply_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="97">
+				width="72">
 					<button
 				     follows="bottom|left|right"
 				     height="23"
@@ -277,7 +297,7 @@ background_visible="false"
 				     name="btn_apply"
 				     left="1"
 				     top="0"
-				     width="96" />
+				     width="71" />
 				</layout_panel>
 		   </layout_stack>
 
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 28d97b01dd..c7476bd676 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -256,7 +256,25 @@ background_visible="false"
 				     name="btn_refresh"
 				     width="23" />
 				</layout_panel>
-				
+
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_activate_lp"
+			    auto_resize="true"
+				width="67">
+					<button
+				     follows="bottom|left|right"
+				     label="Activate"
+				     name="btn_activate"
+				     left="1"     
+				     height="23"
+				     top="0"
+				     width="66" />		
+				</layout_panel>
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
@@ -264,7 +282,7 @@ background_visible="false"
 				left_pad="3"
 				name="btn_chat_lp"
 			    auto_resize="true"
-				width="91">
+				width="67">
 					<button
 				     follows="bottom|left|right"
 				     label="Chat"
@@ -272,7 +290,7 @@ background_visible="false"
 				     left="1"     
 				     height="23"
 				     top="0"
-				     width="90" />		
+				     width="66" />		
 				</layout_panel>
 				
 				<layout_panel
@@ -282,7 +300,7 @@ background_visible="false"
 				left_pad="3"
 				name="call_btn_lp"
 			    auto_resize="true"
-				width="91">
+				width="67">
 					<button
 			         follows="bottom|left|right"
 			         left="1"
@@ -292,7 +310,7 @@ background_visible="false"
 			         layout="topleft"
 			         tool_tip="Call this group"
 			         top="0"
-			         width="90" />		
+			         width="66" />		
 				</layout_panel>
 				
 				<layout_panel
@@ -302,7 +320,7 @@ background_visible="false"
 				left_pad="3"
 				name="btn_apply_lp"
 			    auto_resize="true"
-				width="91">
+				width="67">
 					<button
 				     follows="bottom|left|right"
 				     height="23"
@@ -311,7 +329,7 @@ background_visible="false"
 				     name="btn_apply"
 				     left="1"
 				     top="0"
-				     width="90" />
+				     width="66" />
 				</layout_panel>
 		   </layout_stack>
 
diff --git a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
index 96b508b01b..309de88273 100644
--- a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
@@ -36,7 +36,7 @@
 					<button label="Chat" name="btn_chat"/>
 				</layout_panel>
 				<layout_panel name="call_btn_lp">
-					<button label="Chiamata al gruppo" name="btn_call" tool_tip="Avvia una conferenza vocale in questo gruppo"/>
+					<button label="Chiamata" name="btn_call" tool_tip="Avvia una conferenza vocale in questo gruppo"/>
 				</layout_panel>
 				<layout_panel name="btn_apply_lp">
 					<button label="Salva" label_selected="Salva" name="btn_apply"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
index 0024f9fa50..c7db8a20b1 100644
--- a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
@@ -41,11 +41,14 @@
 				</layout_panel>
 			</layout_stack>
 			<layout_stack name="button_row_ls">
+				<layout_panel name="btn_activate_lp">
+					<button label="Aktywuj" name="btn_activate" />
+				</layout_panel>
 				<layout_panel name="btn_chat_lp">
 					<button label="Czat" name="btn_chat"/>
 				</layout_panel>
 				<layout_panel name="call_btn_lp">
-					<button label="Konferencja głosowa" name="btn_call" tool_tip="Rozpocznij konferencję głosową w tej grupie"/>
+					<button label="Konf. głosowa" name="btn_call" tool_tip="Rozpocznij konferencję głosową w tej grupie"/>
 				</layout_panel>
 				<layout_panel name="btn_apply_lp">
 					<button label="Zapisz" label_selected="Zapisz" name="btn_apply"/>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml
index ae98e142b9..e30d500c06 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml
@@ -219,6 +219,26 @@ background_visible="false"
 				     width="23" />
 				</layout_panel>
 
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_activate_lp"
+			    user_resize="false"
+			    auto_resize="true"
+				width="72">
+					<button
+			         layout="topleft"
+				     follows="bottom|left|right"
+				     label="Activate"
+				     name="btn_activate"
+				     left="1"
+				     height="23"
+				     top="0"
+				     width="71" />
+				</layout_panel>
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
@@ -227,7 +247,7 @@ background_visible="false"
 				name="btn_chat_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="97">
+				width="72">
 					<button
 			         layout="topleft"
 				     follows="bottom|left|right"
@@ -236,7 +256,7 @@ background_visible="false"
 				     left="1"
 				     height="23"
 				     top="0"
-				     width="96" />
+				     width="71" />
 				</layout_panel>
 
 				<layout_panel
@@ -247,7 +267,7 @@ background_visible="false"
 				name="call_btn_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="97">
+				width="72">
 					<button
 			         follows="bottom|left|right"
 			         left="1"
@@ -257,7 +277,7 @@ background_visible="false"
 			         layout="topleft"
 			         tool_tip="Call this group"
 			         top="0"
-			         width="96" />
+			         width="71" />
 				</layout_panel>
 
 				<layout_panel
@@ -268,7 +288,7 @@ background_visible="false"
 				name="btn_apply_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="97">
+				width="72">
 					<button
 				     follows="bottom|left|right"
 				     height="23"
@@ -277,7 +297,7 @@ background_visible="false"
 				     name="btn_apply"
 				     left="1"
 				     top="0"
-				     width="96" />
+				     width="71" />
 				</layout_panel>
 		   </layout_stack>
 
diff --git a/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
index b1c4aa1e80..5904287ef8 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
@@ -209,6 +209,25 @@ background_visible="true"
 			orientation="horizontal"
 			top_delta="2"
 			width="445">
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_activate_lp"
+			    user_resize="false"
+			    auto_resize="true"
+				width="67">
+					<button
+				     follows="bottom|left|right"
+				     label="Activate"
+				     name="btn_activate"
+				     left="1"
+				     height="23"
+				     top="0"
+				     width="66" />
+				</layout_panel>
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
@@ -217,7 +236,7 @@ background_visible="true"
 				name="btn_chat_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="91">
+				width="67">
 					<button
 				     follows="bottom|left|right"
 				     label="Chat"
@@ -225,7 +244,7 @@ background_visible="true"
 				     left="1"
 				     height="23"
 				     top="0"
-				     width="90" />
+				     width="66" />
 				</layout_panel>
 
 				<layout_panel
@@ -236,7 +255,7 @@ background_visible="true"
 				name="call_btn_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="91">
+				width="77">
 					<button
 			         follows="bottom|left|right"
 			         left="1"
@@ -246,7 +265,7 @@ background_visible="true"
 			         layout="topleft"
 			         tool_tip="Call this group"
 			         top="0"
-			         width="90" />
+			         width="76" />
 				</layout_panel>
 
 				<layout_panel
@@ -257,7 +276,7 @@ background_visible="true"
 				name="btn_apply_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="91">
+				width="57">
 					<button
 				     follows="bottom|left|right"
 				     height="23"
@@ -266,7 +285,7 @@ background_visible="true"
 				     name="btn_apply"
 				     left="1"
 				     top="0"
-				     width="90" />
+				     width="56" />
 				</layout_panel>
 		   </layout_stack>
 
diff --git a/indra/newview/skins/starlight/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/starlight/xui/en/panel_group_info_sidetray.xml
index acbb324bb1..86e6d66451 100644
--- a/indra/newview/skins/starlight/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_group_info_sidetray.xml
@@ -268,7 +268,25 @@ background_visible="true"
 			orientation="horizontal"
 			top_delta="0"
 			width="279">
-	
+
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_activate_lp"
+			    auto_resize="true"
+				width="72">
+					<button
+				     follows="bottom|left|right"
+				     label="Activate"
+				     name="btn_activate"
+				     left="1"     
+				     height="23"
+				     top="0"
+				     width="71" />		
+				</layout_panel>
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
@@ -276,7 +294,7 @@ background_visible="true"
 				left_pad="3"
 				name="btn_chat_lp"
 			    auto_resize="true"
-				width="83">
+				width="72">
 					<button
 				     follows="bottom|left|right"
 				     label="Chat"
@@ -284,7 +302,7 @@ background_visible="true"
 				     left="1"     
 				     height="23"
 				     top="0"
-				     width="82" />		
+				     width="71" />		
 				</layout_panel>
 				
 				<layout_panel
@@ -294,7 +312,7 @@ background_visible="true"
 				left_pad="3"
 				name="call_btn_lp"
 			    auto_resize="true"
-				width="113">
+				width="72">
 					<button
 			         follows="bottom|left|right"
 			         left="1"
@@ -304,7 +322,7 @@ background_visible="true"
 			         layout="topleft"
 			         tool_tip="Call this group"
 			         top="0"
-			         width="112" />		
+			         width="71" />		
 				</layout_panel>
 				
 				<layout_panel
@@ -314,7 +332,7 @@ background_visible="true"
 				left_pad="3"
 				name="btn_apply_lp"
 			    auto_resize="true"
-				width="83">
+				width="72">
 					<button
 				     follows="bottom|left|right"
 				     height="23"
@@ -323,7 +341,7 @@ background_visible="true"
 				     name="btn_apply"
 				     left="1"
 				     top="0"
-				     width="82" />
+				     width="71" />
 				</layout_panel>
 		</layout_stack>
    <!--<button
diff --git a/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
index c3416d3e21..91ee847344 100644
--- a/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
@@ -43,6 +43,9 @@
 			<layout_stack name="layout">
 				<layout_panel name="button_row">
 					<layout_stack name="button_row_ls">
+						<layout_panel name="btn_activate_lp">
+							<button label="Aktywuj" name="btn_activate" />
+						</layout_panel>
 						<layout_panel name="btn_chat_lp">
 							<button label="Czat" name="btn_chat"/>
 						</layout_panel>
diff --git a/indra/newview/skins/starlight/xui/ru/panel_group_info_sidetray.xml b/indra/newview/skins/starlight/xui/ru/panel_group_info_sidetray.xml
index 453be7a51f..9b354b5257 100644
--- a/indra/newview/skins/starlight/xui/ru/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/starlight/xui/ru/panel_group_info_sidetray.xml
@@ -39,7 +39,7 @@
 							<button label="Чат" name="btn_chat"/>
 						</layout_panel>
 						<layout_panel name="call_btn_lp">
-							<button label="Звонок группе" name="btn_call" tool_tip="Звонок этой группе"/>
+							<button label="Звонок" name="btn_call" tool_tip="Звонок этой группе"/>
 						</layout_panel>
 						<layout_panel name="btn_apply_lp">
 							<button label="Сохранить" label_selected="Сохранить" name="btn_apply"/>
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/starlightcui/xui/en/panel_group_info_sidetray.xml
index acbb324bb1..86e6d66451 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_group_info_sidetray.xml
@@ -268,7 +268,25 @@ background_visible="true"
 			orientation="horizontal"
 			top_delta="0"
 			width="279">
-	
+
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_activate_lp"
+			    auto_resize="true"
+				width="72">
+					<button
+				     follows="bottom|left|right"
+				     label="Activate"
+				     name="btn_activate"
+				     left="1"     
+				     height="23"
+				     top="0"
+				     width="71" />		
+				</layout_panel>
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
@@ -276,7 +294,7 @@ background_visible="true"
 				left_pad="3"
 				name="btn_chat_lp"
 			    auto_resize="true"
-				width="83">
+				width="72">
 					<button
 				     follows="bottom|left|right"
 				     label="Chat"
@@ -284,7 +302,7 @@ background_visible="true"
 				     left="1"     
 				     height="23"
 				     top="0"
-				     width="82" />		
+				     width="71" />		
 				</layout_panel>
 				
 				<layout_panel
@@ -294,7 +312,7 @@ background_visible="true"
 				left_pad="3"
 				name="call_btn_lp"
 			    auto_resize="true"
-				width="113">
+				width="72">
 					<button
 			         follows="bottom|left|right"
 			         left="1"
@@ -304,7 +322,7 @@ background_visible="true"
 			         layout="topleft"
 			         tool_tip="Call this group"
 			         top="0"
-			         width="112" />		
+			         width="71" />		
 				</layout_panel>
 				
 				<layout_panel
@@ -314,7 +332,7 @@ background_visible="true"
 				left_pad="3"
 				name="btn_apply_lp"
 			    auto_resize="true"
-				width="83">
+				width="72">
 					<button
 				     follows="bottom|left|right"
 				     height="23"
@@ -323,7 +341,7 @@ background_visible="true"
 				     name="btn_apply"
 				     left="1"
 				     top="0"
-				     width="82" />
+				     width="71" />
 				</layout_panel>
 		</layout_stack>
    <!--<button
diff --git a/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
index c3416d3e21..91ee847344 100644
--- a/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
@@ -43,6 +43,9 @@
 			<layout_stack name="layout">
 				<layout_panel name="button_row">
 					<layout_stack name="button_row_ls">
+						<layout_panel name="btn_activate_lp">
+							<button label="Aktywuj" name="btn_activate" />
+						</layout_panel>
 						<layout_panel name="btn_chat_lp">
 							<button label="Czat" name="btn_chat"/>
 						</layout_panel>
diff --git a/indra/newview/skins/vintage/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/vintage/xui/en/panel_group_info_sidetray.xml
index b1c4aa1e80..c16abc7c6d 100644
--- a/indra/newview/skins/vintage/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_group_info_sidetray.xml
@@ -209,6 +209,25 @@ background_visible="true"
 			orientation="horizontal"
 			top_delta="2"
 			width="445">
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_activate_lp"
+			    user_resize="false"
+			    auto_resize="true"
+				width="67">
+					<button
+				     follows="bottom|left|right"
+				     label="Activate"
+				     name="btn_activate"
+				     left="1"
+				     height="23"
+				     top="0"
+				     width="66" />
+				</layout_panel>
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
@@ -217,7 +236,7 @@ background_visible="true"
 				name="btn_chat_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="91">
+				width="67">
 					<button
 				     follows="bottom|left|right"
 				     label="Chat"
@@ -225,7 +244,7 @@ background_visible="true"
 				     left="1"
 				     height="23"
 				     top="0"
-				     width="90" />
+				     width="66" />
 				</layout_panel>
 
 				<layout_panel
@@ -236,7 +255,7 @@ background_visible="true"
 				name="call_btn_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="91">
+				width="67">
 					<button
 			         follows="bottom|left|right"
 			         left="1"
@@ -246,7 +265,7 @@ background_visible="true"
 			         layout="topleft"
 			         tool_tip="Call this group"
 			         top="0"
-			         width="90" />
+			         width="66" />
 				</layout_panel>
 
 				<layout_panel
@@ -257,7 +276,7 @@ background_visible="true"
 				name="btn_apply_lp"
 			    user_resize="false"
 			    auto_resize="true"
-				width="91">
+				width="67">
 					<button
 				     follows="bottom|left|right"
 				     height="23"
@@ -266,7 +285,7 @@ background_visible="true"
 				     name="btn_apply"
 				     left="1"
 				     top="0"
-				     width="90" />
+				     width="66" />
 				</layout_panel>
 		   </layout_stack>
 

From 11920198c0d1dbdc62dfa78d6ae00cff4d5e7a42 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 28 May 2024 00:51:14 +0200
Subject: [PATCH 16/42] Update German translation

---
 .../newview/skins/default/xui/de/panel_group_info_sidetray.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
index d73be4b9b4..a5e3ac68da 100644
--- a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
@@ -45,6 +45,9 @@
 		</layout_panel>
 	</layout_stack>
 	<layout_stack name="button_row_ls">
+		<layout_panel name="btn_activate_lp">
+			<button label="Aktivieren" name="btn_activate"/>
+		</layout_panel>
 		<layout_panel name="btn_chat_lp">
 			<button label="Chat" name="btn_chat"/>
 		</layout_panel>

From d7fe16e36dbcd44175bab6299f33f20ed9974aad Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 28 May 2024 14:39:18 +0100
Subject: [PATCH 17/42] Minor speedup for local lights in busy scenes

---
 indra/newview/pipeline.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 8d047c209f..827b64906b 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -8219,6 +8219,12 @@ void LLPipeline::renderDeferredLighting()
                     const F32 *c = center.getF32ptr();
                     F32        s = volume->getLightRadius() * 1.5f;
 
+                    // <FS:Beq> relocated above colour calc for early exit on small lights
+                    if (s <= 0.001f)
+                    {
+                        continue;
+                    }
+                    // </FS:Beq>
                     // send light color to shader in linear space
                     LLColor3 col = volume->getLightLinearColor() * light_scale;
 
@@ -8226,12 +8232,12 @@ void LLPipeline::renderDeferredLighting()
                     {
                         continue;
                     }
-
-                    if (s <= 0.001f)
-                    {
-                        continue;
-                    }
-
+                    // <FS:Beq> relocated above colour calc for early exit on small lights
+                    // if (s <= 0.001f)
+                    // {
+                    //     continue;
+                    // }
+                    // </FS:Beq>
                     LLVector4a sa;
                     sa.splat(s);
                     if (camera->AABBInFrustumNoFarClip(center, sa) == 0)

From b254e49ddcfd4ba7cc754616c5bd9dd73f9f153b Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 28 May 2024 18:16:00 +0100
Subject: [PATCH 18/42] Minimalist changes for Tracy010

---
 indra/cmake/Tracy.cmake          |  2 +-
 indra/llcommon/CMakeLists.txt    |  6 +++++-
 indra/llcommon/fstracyclient.cpp |  8 ++++++++
 indra/llcommon/llprofiler.h      | 16 ++++++++--------
 4 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 indra/llcommon/fstracyclient.cpp

diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index 00b4844fca..5092e050f9 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -10,7 +10,7 @@ if (USE_TRACY)
   use_prebuilt_binary(tracy)
 
   target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy)
-  target_link_libraries( ll::tracy INTERFACE TracyClient )
+  # target_link_libraries( ll::tracy INTERFACE TracyClient )
 
   # See: indra/llcommon/llprofiler.h
   add_compile_definitions(LL_PROFILER_CONFIGURATION=3)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 43946ba62c..8c861f5faa 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -268,8 +268,12 @@ if (DARWIN)
   list(APPEND llcommon_SOURCE_FILES llsys_objc.mm)
 endif (DARWIN)
     
-# <FS:Beq/> Tracy Profiler support
+# <FS:Beq> Tracy Profiler support
 list(APPEND llcommon_SOURCE_FILES llprofiler.cpp)
+if (USE_TRACY)
+list(APPEND llcommon_SOURCE_FILES fstracyclient.cpp)
+endif()
+# </FS:Beq>
 
 # <FS:ND> Add all nd* files. memory pool, intrinsics, ...
 
diff --git a/indra/llcommon/fstracyclient.cpp b/indra/llcommon/fstracyclient.cpp
new file mode 100644
index 0000000000..c367657804
--- /dev/null
+++ b/indra/llcommon/fstracyclient.cpp
@@ -0,0 +1,8 @@
+// Just a simple wrapper to easily import the single tracy source file and save
+// all the pain of cross platform libraries in the Tracy 3p build.
+#include "linden_common.h"
+
+#if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER
+	#include "TracyClient.cpp"
+#endif // LL_PROFILER_CONFIGURATION
+
diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h
index 428702e0e7..9229479ae7 100644
--- a/indra/llcommon/llprofiler.h
+++ b/indra/llcommon/llprofiler.h
@@ -91,12 +91,12 @@ namespace LLProfiler
 //      #define TRACY_NO_BROADCAST   1
 //      #define TRACY_ONLY_LOCALHOST 1
         #define TRACY_ONLY_IPV4      1
-        #include "Tracy.hpp"
+        #include "tracy/Tracy.hpp"
 // <FS:Beq> Fixed mutual exclusion issues with RAM and GPU. NOTE: This might still break on Apple in which case we'll need to restrict that platform
         //// GPU Mutually exclusive with detailed memory tracing
         // #define LL_PROFILER_ENABLE_TRACY_OPENGL 0
         #define LL_PROFILER_ENABLE_TRACY_MEMORY 0
-        #define LL_PROFILER_ENABLE_TRACY_OPENGL 0
+        #define LL_PROFILER_ENABLE_TRACY_OPENGL 1
 
         // Enable RenderDoc labeling
         #define LL_PROFILER_ENABLE_RENDER_DOC 0
@@ -132,9 +132,9 @@ namespace LLProfiler
         #define LL_PROFILE_ZONE_WARN(name)              LL_PROFILE_ZONE_NAMED_COLOR( name, 0x0FFFF00 )  // RGB red
 
         // <FS:Beq> Additional FS Tracy macros
-        #define LL_PROFILE_ZONE_COLOR(color)            ZoneNamedC( ___tracy_scoped_zone, color, LLProfiler::active ) // <FS:Beq/> Additional Tracy macro
-        #define LL_PROFILE_PLOT( name, value )          TracyPlot( name, value)
-        #define LL_PROFILE_PLOT_SQ( name, prev, value ) TracyPlot(name,prev);TracyPlot( name, value)
+        #define LL_PROFILE_ZONE_COLOR(color)            ZoneNamedC( ___tracy_scoped_zone, color, LLProfiler::active );
+        #define LL_PROFILE_PLOT( name, value )          TracyPlot( name, value);
+        #define LL_PROFILE_PLOT_CONFIG_SQUARE(name)     TracyPlotConfig(name, tracy::PlotFormatType::Number, true, false, 0);
         #define LL_PROFILE_IS_CONNECTED                 TracyIsConnected
         // </FS:Beq>
     #endif
@@ -158,7 +158,7 @@ namespace LLProfiler
         // <FS:Beq> Additional FS Tracy macros
         #define LL_PROFILE_ZONE_COLOR(color)
         #define LL_PROFILE_PLOT( name, value )
-        #define LL_PROFILE_PLOT_SQ( name, prev, value )
+        #define LL_PROFILE_PLOT_CONFIG_SQUARE(name)
         #define LL_PROFILE_IS_CONNECTED
         // </FS:Beq>
     #endif
@@ -190,7 +190,7 @@ namespace LLProfiler
         // <FS:Beq> Additional FS Tracy macros
         #define LL_PROFILE_ZONE_COLOR(color)            ZoneNamedC( ___tracy_scoped_zone, color, LLProfiler::active )
         #define LL_PROFILE_PLOT( name, value )          TracyPlot( name, value)
-        #define LL_PROFILE_PLOT_SQ( name, prev, value ) TracyPlot( name, prev );TracyPlot( name, value )
+        #define LL_PROFILE_PLOT_CONFIG_SQUARE(name)     TracyPlotConfig(name, tracy::PlotFormatType::Number, true, false, 0)
         #define LL_PROFILE_IS_CONNECTED                 TracyIsConnected
         // </FS:Beq>
     #endif
@@ -215,7 +215,7 @@ namespace LLProfiler
     // <FS:Ansariel> Additional FS Tracy macros
     #define LL_PROFILE_ZONE_COLOR(color)
     #define LL_PROFILE_PLOT( name, value )
-    #define LL_PROFILE_PLOT_SQ( name, prev, value )
+    #define LL_PROFILE_PLOT_CONFIG_SQUARE(name)
     #define LL_PROFILE_IS_CONNECTED
     // </FS:Ansariel>
 #endif // LL_PROFILER

From a91ba82c419700cfac3a4b6fd873bf435ba595e7 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 28 May 2024 18:19:18 +0100
Subject: [PATCH 19/42] Add TRACY ENABLE exclusion to custom blocks

---
 indra/newview/llperfstats.h | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llperfstats.h b/indra/newview/llperfstats.h
index 0038d160fb..457d4458f6 100644
--- a/indra/newview/llperfstats.h
+++ b/indra/newview/llperfstats.h
@@ -283,9 +283,12 @@ namespace LLPerfStats
             auto val {upd.time};
             // <FS:Beq> markup to support coverage testing on stats collection
             #ifdef TRACY_ENABLE
-            //LL_PROFILE_ZONE_TEXT(key.toStringFast(obstr), 36);
-            //LL_PROFILE_ZONE_TEXT(avKey.toStringFast(avstr), 36);
-            //LL_PROFILE_ZONE_NUM(val);
+            auto& avKey{upd.avID};
+            static char obstr[36];
+            static char avstr[36];            
+            LL_PROFILE_ZONE_TEXT(key.toStringFast(obstr), 36);
+            LL_PROFILE_ZONE_TEXT(avKey.toStringFast(avstr), 36);
+            LL_PROFILE_ZONE_NUM(val);
             #endif
             // </FS:Beq>
 
@@ -429,13 +432,13 @@ namespace LLPerfStats
         // </FS:Beq>
             stat.time = LLTrace::BlockTimer::getCPUClockCount64() - start;
         // <FS:Beq> extra profiling coverage tracking
-        #ifdef ATTACHMENT_TRACKING
-            static char obstr[36];
-            static char avstr[36];
-            LL_PROFILE_ZONE_NUM(static_cast<U64>(stat.objType));
-            LL_PROFILE_ZONE_TEXT(stat.avID.toStringFast(avstr), 36);
-            LL_PROFILE_ZONE_TEXT(stat.objID.toStringFast(obstr), 36);
-            LL_PROFILE_ZONE_NUM(stat.time);
+        #if TRACY_ENABLE && defined(ATTACHMENT_TRACKING)
+            // static char obstr[36];
+            // static char avstr[36];
+            // LL_PROFILE_ZONE_NUM(static_cast<U64>(stat.objType));
+            // LL_PROFILE_ZONE_TEXT(stat.avID.toStringFast(avstr), 36);
+            // LL_PROFILE_ZONE_TEXT(stat.objID.toStringFast(obstr), 36);
+            // LL_PROFILE_ZONE_NUM(stat.time);
         #endif
         // </FS:Beq>
             StatsRecorder::send(std::move(stat));

From 1541ad58479db7b3acdd909a7b97ed6ca7317b46 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Tue, 28 May 2024 22:37:16 +0200
Subject: [PATCH 20/42] FIRE-33951 Russian translation update, by Romka
 Swallowtail

---
 .../skins/default/xui/ru/floater_whitelist.xml  | 17 +++++++++++++++++
 .../skins/default/xui/ru/menu_viewer.xml        |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/ru/floater_whitelist.xml

diff --git a/indra/newview/skins/default/xui/ru/floater_whitelist.xml b/indra/newview/skins/default/xui/ru/floater_whitelist.xml
new file mode 100644
index 0000000000..f202a6b919
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_whitelist.xml
@@ -0,0 +1,17 @@
+<floater name="whitelist_floater" title="Папки и двоичные файлы Белого списка">
+	<text name="whitelist_intro">
+Антивирус и защита от вредоносных программ являются неотъемлемой частью безопасного использования Интернета, но они могут вызвать целый ряд проблем у пользователя.
+Чтобы уменьшить помехи и повысить стабильность и производительность, мы настоятельно рекомендуем всем пользователям убедиться в наличии исключений (известных как Белый список) для важных папок и программ, которые использует программа просмотра.
+
+Для получения более подробной информации посетите веб-сайт
+https://wiki.firestormviewer.org/antivirus_whitelisting
+	</text>
+	<text name="whitelist_folder_instruction">
+Чтобы упростить задачу, в поле ниже указаны папки, которые использует программа просмотра.
+Пожалуйста добавьте их в список исключений антивируса для папок, как показано на вики-странице выше.
+	</text>
+	<text name="whitelist_exe_instruction">
+В следующем поле указаны название и полный путь к исполняемым файлам программы просмотра.
+Добавьте их в список исключений антивируса для файлов, как показано на вики-странице выше.
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index d11494a6ec..26796ab91f 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -334,6 +334,7 @@
 		<menu_item_call label="Support portal" name="Support portal"/>
 		<menu_item_call label="[SECOND_LIFE] News" name="Second Life News"/>
 		<menu_item_call label="[SECOND_LIFE] Blogs" name="Second Life Blogs"/> -->
+		<menu_item_call name="whitelist_folders" label="Советник Белого Списка"/>
 		<menu_item_call label="Проверка статуса сети (Grid Status)" name="Grid Status"/>
 		<menu_item_call label="Пожаловаться" name="Report Abuse"/>
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>

From 5f190b112e914af442d48d6714c795b4a35da614 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Wed, 29 May 2024 20:46:34 +0100
Subject: [PATCH 21/42] Additional profiling scopes and remove some superfluous
 ones.

---
 indra/llcommon/llprofiler.h                 |  2 ++
 indra/llcommon/llsdserialize.cpp            |  1 +
 indra/llcommon/lltimer.cpp                  |  2 +-
 indra/llcorehttp/_httppolicy.cpp            |  1 +
 indra/llmessage/llmessagetemplate.h         |  1 +
 indra/llmessage/lltemplatemessagereader.cpp | 22 ++++++++++++++++++++-
 indra/llrender/llimagegl.cpp                |  1 +
 indra/llrender/llvertexbuffer.cpp           |  1 +
 indra/llwindow/llwindowwin32.cpp            |  5 +++--
 indra/newview/llperfstats.h                 |  1 -
 indra/newview/llviewerregion.cpp            |  2 ++
 indra/newview/llvocache.cpp                 | 16 +++++++++++++++
 12 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h
index 9229479ae7..631f0434a0 100644
--- a/indra/llcommon/llprofiler.h
+++ b/indra/llcommon/llprofiler.h
@@ -225,6 +225,7 @@ namespace LLProfiler
 #define LL_PROFILE_GPU_ZONEC(name,color) TracyGpuZoneC(name,color)
 #define LL_PROFILER_GPU_COLLECT           TracyGpuCollect
 #define LL_PROFILER_GPU_CONTEXT           TracyGpuContext
+#define LL_PROFILER_GPU_CONTEXT_NS(name, size)           TracyGpuContext;TracyGpuContextName(name,size);
 
 // disable memory tracking (incompatible with GPU tracing
 #define LL_PROFILE_ALLOC(ptr, size)             (void)(ptr); (void)(size);
@@ -234,6 +235,7 @@ namespace LLProfiler
 #define LL_PROFILE_GPU_ZONEC(name,color) (void)name;(void)color;
 #define LL_PROFILER_GPU_COLLECT
 #define LL_PROFILER_GPU_CONTEXT
+#define LL_PROFILER_GPU_CONTEXT_NS(name, size)           (void)name;(void)size;
 
 #define LL_LABEL_OBJECT_GL(type, name, length, label)
 
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index c854e30060..389dc2c39e 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -122,6 +122,7 @@ void LLSDSerialize::serialize(const LLSD& sd, std::ostream& str, ELLSD_Serialize
 // static
 bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, llssize max_bytes)
 {
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_LLSD;
     char hdr_buf[MAX_HDR_LEN + 1] = ""; /* Flawfinder: ignore */
     bool fail_if_not_legacy = false;
 
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index 6f74bf3fc8..a34b8f1024 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -70,7 +70,7 @@ LLTimer* LLTimer::sTimer = NULL;
 #if 0
 void ms_sleep(U32 ms)
 {
-    LL_PROFILE_ZONE_SCOPED;
+    // LL_PROFILE_ZONE_SCOPED;
     using TimePoint = std::chrono::steady_clock::time_point;
     auto resume_time = TimePoint::clock::now() + std::chrono::milliseconds(ms);
     while (TimePoint::clock::now() < resume_time)
diff --git a/indra/llcorehttp/_httppolicy.cpp b/indra/llcorehttp/_httppolicy.cpp
index 704c8abb93..03ac521b87 100644
--- a/indra/llcorehttp/_httppolicy.cpp
+++ b/indra/llcorehttp/_httppolicy.cpp
@@ -213,6 +213,7 @@ void HttpPolicy::retryOp(const HttpOpRequest::ptr_t &op)
 //
 HttpService::ELoopSpeed HttpPolicy::processReadyQueue()
 {
+    LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;// <FS:Beq/> missing http trace
     const HttpTime now(totalTime());
     HttpService::ELoopSpeed result(HttpService::REQUEST_SLEEP);
     HttpLibcurl & transport(mService->getTransport());
diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h
index 85a765b085..e949d2b395 100644
--- a/indra/llmessage/llmessagetemplate.h
+++ b/indra/llmessage/llmessagetemplate.h
@@ -365,6 +365,7 @@ public:
 
     BOOL callHandlerFunc(LLMessageSystem *msgsystem) const
     {
+        LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
         if (mHandlerFunc)
         {
 
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index 0fd8ee875c..1eec975d46 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -541,6 +541,11 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
     llassert( mCurrentRMessageTemplate);
     llassert( !mCurrentRMessageData );
     delete mCurrentRMessageData; // just to make sure
+	// <FS:Beq> storage for Tracy tag
+	#ifdef TRACY_ENABLE
+	static char msgstr[36];
+	#endif
+    // </FS:Beq>    
 
     // The offset tells us how may bytes to skip after the end of the
     // message name.
@@ -556,6 +561,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
         iter != mCurrentRMessageTemplate->mMemberBlocks.end();
         ++iter)
     {
+        LL_PROFILE_ZONE_NAMED_CATEGORY_NETWORK("BuildFromTemplate");
         LLMessageBlock* mbci = *iter;
         U8  repeat_number;
         S32 i;
@@ -598,6 +604,13 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
         }
 
         LLMsgBlkData* cur_data_block = NULL;
+        // <FS:Beq> Tracy Message processing
+		LL_DEBUGS("LLMessage") << "Processing " << mbci->mName << " with " << repeat_number << " repetitions" << LL_ENDL;
+		#ifdef TRACY_ENABLE
+		strncpy(msgstr, mbci->mName, 35);
+		LL_PROFILE_ZONE_TEXT(msgstr, 35);
+		#endif        
+        // </FS:Beq>
 
         // now loop through the block
         for (i = 0; i < repeat_number; i++)
@@ -622,6 +635,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
                      mbci->mMemberVariables.begin();
                  iter != mbci->mMemberVariables.end(); iter++)
             {
+				LL_PROFILE_ZONE_NAMED_CATEGORY_NETWORK("AddVariables");
                 const LLMessageVariable& mvci = **iter;
 
                 // ok, build out the variables
@@ -704,6 +718,12 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
     }
 
     {
+        // <FS:Beq> Tracy Message processing
+        LL_PROFILE_ZONE_NAMED_CATEGORY_NETWORK("ProcessMessage");
+		#ifdef TRACY_ENABLE
+		LL_PROFILE_ZONE_TEXT(msgstr, 35);
+		#endif
+        // </FS:Beq>
         static LLTimer decode_timer;
 
         if(LLMessageReader::getTimeDecodes() || gMessageSystem->getTimingCallback())
@@ -742,7 +762,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
 
                 if(decode_time > LLMessageReader::getTimeDecodesSpamThreshold())
                 {
-                    LL_DEBUGS() << "--------- Message " << mCurrentRMessageTemplate->mName << " decode took " << decode_time << " seconds. (" <<
+					LL_DEBUGS("LLMessage") << "--------- Message " << mCurrentRMessageTemplate->mName << " decode took " << decode_time << " seconds. (" <<
                         mCurrentRMessageTemplate->mMaxDecodeTimePerMsg << " max, " <<
                         (mCurrentRMessageTemplate->mTotalDecodeTime / mCurrentRMessageTemplate->mTotalDecoded) << " avg)" << LL_ENDL;
                 }
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 6d41a5a22d..5a83c6e68f 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -2547,6 +2547,7 @@ void LLImageGLThread::run()
     // WorkQueue, likewise cleanup afterwards.
     mWindow->makeContextCurrent(mContext);
     gGL.init(false);
+	LL_PROFILER_GPU_CONTEXT_NS("LLImageGL Context", 17);
     LL::ThreadPool::run();
     gGL.shutdown();
     mWindow->destroySharedContext(mContext);
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 78227a7207..548ce6c308 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -237,6 +237,7 @@ public:
     {
         mWindow->makeContextCurrent(mContext);
         gGL.init(false);
+        LL_PROFILER_GPU_CONTEXT_NS("LLGLWorker Context", 18);
         mQueue->runUntilClose();
         gGL.shutdown();
         mWindow->destroySharedContext(mContext);
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 2f2d2cca88..2573b8be5b 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1686,6 +1686,7 @@ const   S32   max_format  = (S32)num_formats - 1;
         close();
         return FALSE;
     }
+	//LL_PROFILER_GPU_CONTEXT; <FS:Beq/> TODO(Beq) review this 
 
     LL_PROFILER_GPU_CONTEXT
 
@@ -1720,7 +1721,7 @@ const   S32   max_format  = (S32)num_formats - 1;
         swapBuffers();
     }
 
-    LL_PROFILER_GPU_CONTEXT;
+    LL_PROFILER_GPU_CONTEXT_NS("MainGL Context", 14);
 
     return TRUE;
 }
@@ -1890,7 +1891,7 @@ void* LLWindowWin32::createSharedContext()
 void LLWindowWin32::makeContextCurrent(void* contextPtr)
 {
     wglMakeCurrent(mhDC, (HGLRC) contextPtr);
-    LL_PROFILER_GPU_CONTEXT;
+
 }
 
 void LLWindowWin32::destroySharedContext(void* contextPtr)
diff --git a/indra/newview/llperfstats.h b/indra/newview/llperfstats.h
index 457d4458f6..06626f428a 100644
--- a/indra/newview/llperfstats.h
+++ b/indra/newview/llperfstats.h
@@ -283,7 +283,6 @@ namespace LLPerfStats
             auto val {upd.time};
             // <FS:Beq> markup to support coverage testing on stats collection
             #ifdef TRACY_ENABLE
-            auto& avKey{upd.avID};
             static char obstr[36];
             static char avstr[36];            
             LL_PROFILE_ZONE_TEXT(key.toStringFast(obstr), 36);
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 381a773e9e..0f98d9c548 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -834,6 +834,7 @@ void LLViewerRegion::setRegionID(const LLUUID& region_id)
 
 void LLViewerRegion::loadObjectCache()
 {
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
     if (mCacheLoaded)
     {
         return;
@@ -3126,6 +3127,7 @@ void LLViewerRegion::clearVOCacheFromMemory()
 
 void LLViewerRegion::unpackRegionHandshake()
 {
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
     LLMessageSystem *msg = gMessageSystem;
 
     U64 region_flags = 0;
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 32b614d596..f0d51199ab 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -1541,6 +1541,7 @@ BOOL LLVOCache::updateEntry(const HeaderEntryInfo* entry)
 bool LLVOCache::readFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_entry_map_t& cache_entry_map)
 // </FS:Beq>
 {
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
     if(!mEnabled)
     {
         LL_WARNS() << "Not reading cache for handle " << handle << "): Cache is currently disabled." << LL_ENDL;
@@ -1559,6 +1560,7 @@ bool LLVOCache::readFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::voca
     S32 num_entries=0;  // <FS:Beq/> FIRE-33808 - Material Override Cache causes long delays
     std::string filename;
     {
+		LL_PROFILE_ZONE_NAMED_CATEGORY_NETWORK("VOCache:loadRegionObjectCache");        
         LLUUID cache_id;
         getObjectCacheFilename(handle, filename);
         LLAPRFile apr_file(filename, APR_READ|APR_BINARY, mLocalAPRFilePoolp);
@@ -1567,6 +1569,7 @@ bool LLVOCache::readFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::voca
 
         if(success)
         {
+            LL_PROFILE_ZONE_NAMED_CATEGORY_NETWORK("VOCache:loadCacheForRegion");
             if(cache_id != id)
             {
                 LL_INFOS() << "Cache ID doesn't match for this region, discarding"<< LL_ENDL;
@@ -1615,6 +1618,7 @@ bool LLVOCache::readFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::voca
 // void LLVOCache::readGenericExtrasFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_gltf_overrides_map_t& cache_extras_entry_map)
 void LLVOCache::readGenericExtrasFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_gltf_overrides_map_t& cache_extras_entry_map, const LLVOCacheEntry::vocache_entry_map_t& cache_entry_map)
 {
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
     int loaded= 0;
     int discarded = 0;
     // get ViewerRegion pointer from handle
@@ -1635,6 +1639,13 @@ void LLVOCache::readGenericExtrasFromCache(U64 handle, const LLUUID& id, LLVOCac
     }
 
     std::string filename(getObjectCacheExtrasFilename(handle));
+    // <FS:Beq> Material Override Cache caused long delays
+	#ifdef TRACY_ENABLE
+	static char extra_filename[256];
+	strncpy(extra_filename, filename.c_str(), 256);
+	LL_PROFILE_ZONE_TEXT(extra_filename,256);
+	#endif
+    // </FS:Beq>
     llifstream in(filename, std::ios::in | std::ios::binary);
 
     std::string line;
@@ -1714,8 +1725,10 @@ void LLVOCache::readGenericExtrasFromCache(U64 handle, const LLUUID& id, LLVOCac
     LL_DEBUGS("GLTF") << "Beginning reading extras cache for handle " << handle << " from " << getObjectCacheExtrasFilename(handle) << LL_ENDL;
 
     LLSD entry_llsd;
+	LL_PROFILE_ZONE_NUM(num_entries);
     for (U32 i = 0; i < num_entries && !in.eof(); i++)
     {
+		LL_PROFILE_ZONE_NAMED_CATEGORY_NETWORK("RegionExtrasReadEntries");
         static const U32 max_size = 4096;
         bool success = LLSDSerialize::deserialize(entry_llsd, in, max_size);
         // check bool(in) this time since eof is not a failure condition here
@@ -1756,6 +1769,7 @@ void LLVOCache::readGenericExtrasFromCache(U64 handle, const LLUUID& id, LLVOCac
 
 void LLVOCache::purgeEntries(U32 size)
 {
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
     // <FS:Beq/> FIRE-33808 - Material Override Cache causes long delays
     LL_DEBUGS("VOCache","GLTF") << "Purging " << size << " entries from cache" << LL_ENDL;
     while(mHeaderEntryQueue.size() > size)
@@ -1775,6 +1789,7 @@ void LLVOCache::purgeEntries(U32 size)
 
 void LLVOCache::writeToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_entry_map_t& cache_entry_map, BOOL dirty_cache, bool removal_enabled)
 {
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
     // <FS:Beq> FIRE-33808 - Material Override Cache causes long delays
     std::string filename;
     getObjectCacheFilename(handle, filename);
@@ -1942,6 +1957,7 @@ void LLVOCache::removeGenericExtrasForHandle(U64 handle)
 
 void LLVOCache::writeGenericExtrasToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_gltf_overrides_map_t& cache_extras_entry_map, BOOL dirty_cache, bool removal_enabled)
 {
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
     if(!mEnabled)
     {
         LL_WARNS() << "Not writing extras cache for handle " << handle << "): Cache is currently disabled." << LL_ENDL;

From 891162d0a3477ca23691ee90327bcaf629952461 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Wed, 29 May 2024 23:53:18 +0100
Subject: [PATCH 22/42] Fix a few things and update the autobuild to the new
 file

Tools for this version are https://3p.firestormviewer.org/Tracy.zip
---
 autobuild.xml               | 32 +++++++----------------
 indra/llcommon/llprofiler.h | 52 ++++++++++++++++++-------------------
 indra/newview/llperfstats.h |  9 +++++++
 3 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6506988d77..c8a33d142f 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2817,51 +2817,37 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       <map>
         <key>platforms</key>
         <map>
-          <key>darwin64</key>
+          <key>windows</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>49650353442698c3e05102676fe427d0ebe02f0b</string>
+              <string>fc67514183e7dbbb96bebb9970e1431c</string>
               <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>md5</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-tracy/releases/download/v0.8.1-eecbf72/tracy-v0.8.1-eecbf72-darwin64-eecbf72.tar.zst</string>
+              <string>https://3p.firestormviewer.org/tracy-v0.10.241491433-windows-241491433.tar.bz2</string>
             </map>
             <key>name</key>
-            <string>darwin64</string>
-          </map>
-          <key>windows64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>2b80e7407e4f3e82eff3879add0e9ad63e7fcace</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
-              <key>url</key>
-              <string>https://github.com/secondlife/3p-tracy/releases/download/v0.8.1-eecbf72/tracy-v0.8.1-eecbf72-windows64-eecbf72.tar.zst</string>
-            </map>
-            <key>name</key>
-            <string>windows64</string>
+            <string>windows</string>
           </map>
         </map>
         <key>license</key>
         <string>bsd</string>
         <key>license_file</key>
-        <string>LICENSES/tracy_license.txt</string>
+        <string>LICENSES/Tracy.txt</string>
         <key>copyright</key>
         <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
         <key>version</key>
-        <string>v0.8.1-eecbf72</string>
+        <string>v0.10.241491433</string>
         <key>name</key>
         <string>tracy</string>
         <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
+        <string>https://github.com/beqjanus/3p-tracy</string>
         <key>description</key>
         <string>Tracy Profiler Library</string>
         <key>source</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
+        <string>https://github.com/beqjanus/3p-tracy</string>
         <key>source_type</key>
         <string>git</string>
       </map>
diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h
index 631f0434a0..11721aa62e 100644
--- a/indra/llcommon/llprofiler.h
+++ b/indra/llcommon/llprofiler.h
@@ -104,28 +104,28 @@ namespace LLProfiler
     #endif
 
     #if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY
-        #define LL_PROFILER_FRAME_END                   FrameMark
+        #define LL_PROFILER_FRAME_END                   FrameMark;
         // <FS:Beq> Note: this threadlocal forces memory colelction enabled from the start. It conflicts with deferred profiling.
         #define LL_PROFILER_SET_THREAD_NAME( name )     tracy::SetThreadName( name );    gProfilerEnabled = true;
         // </FS:Beq>
-        #define LL_PROFILER_THREAD_BEGIN(name)          FrameMarkStart( name ) // C string
-        #define LL_PROFILER_THREAD_END(name)            FrameMarkEnd( name )   // C string
+        #define LL_PROFILER_THREAD_BEGIN(name)          FrameMarkStart( name ); // C string
+        #define LL_PROFILER_THREAD_END(name)            FrameMarkEnd( name );   // C string
         // <FS:Beq> revert change that obscures custom FTM zones. We may want to may FTM Zones unique in future.
         // #define LL_RECORD_BLOCK_TIME(name)              ZoneScoped // Want descriptive names; was: ZoneNamedN( ___tracy_scoped_zone, #name, LLProfiler::active );
-        #define LL_RECORD_BLOCK_TIME(name)              ZoneNamedN( ___tracy_scoped_zone, #name, LLProfiler::active )
+        #define LL_RECORD_BLOCK_TIME(name)              ZoneNamedN( ___tracy_scoped_zone, #name, LLProfiler::active );
         // </FS:Beq>
 
         // <FS:Beq>
         // #define LL_PROFILE_ZONE_NAMED(name)             ZoneNamedN( ___tracy_scoped_zone, name, true )
         // #define LL_PROFILE_ZONE_NAMED_COLOR(name,color) ZoneNamedNC( ___tracy_scopped_zone, name, color, true ) // RGB
         // #define LL_PROFILE_ZONE_SCOPED                  ZoneScoped
-        #define LL_PROFILE_ZONE_NAMED(name)             ZoneNamedN( ___tracy_scoped_zone, name, LLProfiler::active )
-        #define LL_PROFILE_ZONE_NAMED_COLOR(name,color) ZoneNamedNC( ___tracy_scopped_zone, name, color, LLProfiler::active ) // RGB
-        #define LL_PROFILE_ZONE_SCOPED                  ZoneNamed( ___tracy_scoped_zone, LLProfiler::active ) // <FS:Beq/> Enable deferred collection through filters
+        #define LL_PROFILE_ZONE_NAMED(name)             ZoneNamedN( ___tracy_scoped_zone, name, LLProfiler::active );
+        #define LL_PROFILE_ZONE_NAMED_COLOR(name,color) ZoneNamedNC( ___tracy_scopped_zone, name, color, LLProfiler::active ); // RGB
+        #define LL_PROFILE_ZONE_SCOPED                  ZoneNamed( ___tracy_scoped_zone, LLProfiler::active ); // <FS:Beq/> Enable deferred collection through filters
         // </FS:Beq>
 
-        #define LL_PROFILE_ZONE_NUM( val )              ZoneValue( val )
-        #define LL_PROFILE_ZONE_TEXT( text, size )      ZoneText( text, size )
+        #define LL_PROFILE_ZONE_NUM( val )              ZoneValue( val );
+        #define LL_PROFILE_ZONE_TEXT( text, size )      ZoneText( text, size );
 
         #define LL_PROFILE_ZONE_ERR(name)               LL_PROFILE_ZONE_NAMED_COLOR( name, 0XFF0000  )  // RGB yellow
         #define LL_PROFILE_ZONE_INFO(name)              LL_PROFILE_ZONE_NAMED_COLOR( name, 0X00FFFF  )  // RGB cyan
@@ -163,10 +163,10 @@ namespace LLProfiler
         // </FS:Beq>
     #endif
     #if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER
-        #define LL_PROFILER_FRAME_END                   FrameMark
+        #define LL_PROFILER_FRAME_END                   FrameMark;
         #define LL_PROFILER_SET_THREAD_NAME( name )     tracy::SetThreadName( name );    gProfilerEnabled = true;
-        #define LL_PROFILER_THREAD_BEGIN(name)          FrameMarkStart( name ) // C string
-        #define LL_PROFILER_THREAD_END(name)            FrameMarkEnd( name )   // C string
+        #define LL_PROFILER_THREAD_BEGIN(name)          FrameMarkStart( name ); // C string
+        #define LL_PROFILER_THREAD_END(name)            FrameMarkEnd( name );   // C string
 
         // <FS:Beq> revert change that obscures custom FTM zones.
         // #define LL_RECORD_BLOCK_TIME(name)              ZoneScoped                                          const LLTrace::BlockTimer& LL_GLUE_TOKENS(block_time_recorder, __LINE__)(LLTrace::timeThisBlock(name)); (void)LL_GLUE_TOKENS(block_time_recorder, __LINE__);
@@ -177,20 +177,20 @@ namespace LLProfiler
         // #define LL_PROFILE_ZONE_NAMED_COLOR(name,color) ZoneNamedNC( ___tracy_scopped_zone, name, color, true ) // RGB
         // #define LL_PROFILE_ZONE_SCOPED                  ZoneScoped
         #define LL_PROFILE_ZONE_NAMED(name)             ZoneNamedN( ___tracy_scoped_zone, name, LLProfiler::active );
-        #define LL_PROFILE_ZONE_NAMED_COLOR(name,color) ZoneNamedNC( ___tracy_scopped_zone, name, color, LLProfiler::active ) // RGB
-        #define LL_PROFILE_ZONE_SCOPED                  ZoneNamed( ___tracy_scoped_zone, LLProfiler::active ) // <FS:Beq/> Enable deferred collection through filters
+        #define LL_PROFILE_ZONE_NAMED_COLOR(name,color) ZoneNamedNC( ___tracy_scopped_zone, name, color, LLProfiler::active ); // RGB
+        #define LL_PROFILE_ZONE_SCOPED                  ZoneNamed( ___tracy_scoped_zone, LLProfiler::active ); // <FS:Beq/> Enable deferred collection through filters
         // </FS:Beq>
 
-        #define LL_PROFILE_ZONE_NUM( val )              ZoneValue( val )
-        #define LL_PROFILE_ZONE_TEXT( text, size )      ZoneText( text, size )
+        #define LL_PROFILE_ZONE_NUM( val )              ZoneValue( val );
+        #define LL_PROFILE_ZONE_TEXT( text, size )      ZoneText( text, size );
 
         #define LL_PROFILE_ZONE_ERR(name)               LL_PROFILE_ZONE_NAMED_COLOR( name, 0XFF0000  )  // RGB yellow
         #define LL_PROFILE_ZONE_INFO(name)              LL_PROFILE_ZONE_NAMED_COLOR( name, 0X00FFFF  )  // RGB cyan
         #define LL_PROFILE_ZONE_WARN(name)              LL_PROFILE_ZONE_NAMED_COLOR( name, 0x0FFFF00 )  // RGB red
         // <FS:Beq> Additional FS Tracy macros
-        #define LL_PROFILE_ZONE_COLOR(color)            ZoneNamedC( ___tracy_scoped_zone, color, LLProfiler::active )
-        #define LL_PROFILE_PLOT( name, value )          TracyPlot( name, value)
-        #define LL_PROFILE_PLOT_CONFIG_SQUARE(name)     TracyPlotConfig(name, tracy::PlotFormatType::Number, true, false, 0)
+        #define LL_PROFILE_ZONE_COLOR(color)            ZoneNamedC( ___tracy_scoped_zone, color, LLProfiler::active );
+        #define LL_PROFILE_PLOT( name, value )          TracyPlot( name, value);
+        #define LL_PROFILE_PLOT_CONFIG_SQUARE(name)     TracyPlotConfig(name, tracy::PlotFormatType::Number, true, false, 0);
         #define LL_PROFILE_IS_CONNECTED                 TracyIsConnected
         // </FS:Beq>
     #endif
@@ -221,10 +221,10 @@ namespace LLProfiler
 #endif // LL_PROFILER
 
 #if LL_PROFILER_ENABLE_TRACY_OPENGL
-#define LL_PROFILE_GPU_ZONE(name)        TracyGpuZone(name)
-#define LL_PROFILE_GPU_ZONEC(name,color) TracyGpuZoneC(name,color)
-#define LL_PROFILER_GPU_COLLECT           TracyGpuCollect
-#define LL_PROFILER_GPU_CONTEXT           TracyGpuContext
+#define LL_PROFILE_GPU_ZONE(name)        TracyGpuZone(name);
+#define LL_PROFILE_GPU_ZONEC(name,color) TracyGpuZoneC(name,color);
+#define LL_PROFILER_GPU_COLLECT           TracyGpuCollect;
+#define LL_PROFILER_GPU_CONTEXT           TracyGpuContext;
 #define LL_PROFILER_GPU_CONTEXT_NS(name, size)           TracyGpuContext;TracyGpuContextName(name,size);
 
 // disable memory tracking (incompatible with GPU tracing
@@ -240,8 +240,8 @@ namespace LLProfiler
 #define LL_LABEL_OBJECT_GL(type, name, length, label)
 
 #if LL_PROFILER_CONFIGURATION > 1
-#define LL_PROFILE_ALLOC(ptr, size)             TracyAlloc(ptr, size)
-#define LL_PROFILE_FREE(ptr)                    TracyFree(ptr)
+#define LL_PROFILE_ALLOC(ptr, size)             TracyAlloc(ptr, size);
+#define LL_PROFILE_FREE(ptr)                    TracyFree(ptr);
 #else
 #define LL_PROFILE_ALLOC(ptr, size)             (void)(ptr); (void)(size);
 #define LL_PROFILE_FREE(ptr)                    (void)(ptr);
@@ -250,7 +250,7 @@ namespace LLProfiler
 #endif
 
 #if LL_PROFILER_ENABLE_RENDER_DOC
-#define LL_LABEL_OBJECT_GL(type, name, length, label) glObjectLabel(type, name, length, label)
+#define LL_LABEL_OBJECT_GL(type, name, length, label) glObjectLabel(type, name, length, label);
 #else
 #define LL_LABEL_OBJECT_GL(type, name, length, label)
 #endif
diff --git a/indra/newview/llperfstats.h b/indra/newview/llperfstats.h
index 06626f428a..1e99fa343a 100644
--- a/indra/newview/llperfstats.h
+++ b/indra/newview/llperfstats.h
@@ -279,6 +279,7 @@ namespace LLPerfStats
 
             auto ot{upd.objType};
             auto& key{upd.objID};
+            auto& avKey{upd.avID};
             auto type {upd.statType};
             auto val {upd.time};
             // <FS:Beq> markup to support coverage testing on stats collection
@@ -297,6 +298,14 @@ namespace LLPerfStats
                 doUpd(key, ot, type,val);
                 return;
             }
+
+            
+            if (ot == ObjType_t::OT_AVATAR)
+            {
+                // LL_INFOS("perfstats") << "Avatar update:" << LL_ENDL;
+                doUpd(avKey, ot, type, val);
+                return;
+            }            
         }
 
         static inline void doUpd(const LLUUID& key, ObjType_t ot, StatType_t type, uint64_t val)

From 19969394ab4492ae4991ca233598f003dd13d0eb Mon Sep 17 00:00:00 2001
From: tim <humbletim@gmail.com>
Date: Wed, 8 May 2024 01:52:26 -0400
Subject: [PATCH 23/42] FIRE-31368 prototype hop url fixes

---
 indra/newview/llworldmapmessage.cpp    |  10 ++
 indra/newview/llworldmapmessage.fs.c++ | 185 +++++++++++++++++++++++++
 indra/newview/llworldmapmessage.fs.h   |  13 ++
 3 files changed, 208 insertions(+)
 create mode 100644 indra/newview/llworldmapmessage.fs.c++
 create mode 100644 indra/newview/llworldmapmessage.fs.h

diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index 0426fb338c..c0ddd453dd 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -35,6 +35,9 @@
 
 // <FS:CR> Aurora Sim
 #include "llviewernetwork.h"
+#ifdef OPENSIM
+#include "llworldmapmessage.fs.c++"
+#endif
 // </FS:CR> Aurora Sim
 
 const U32 LAYER_FLAG = 2;
@@ -99,6 +102,9 @@ void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name,
         const std::string& callback_url,
         bool teleport)  // immediately teleport when result returned
 {
+#ifdef OPENSIM
+    if (hypergrid_sendExactNamedRegionRequest(region_name, callback, callback_url, teleport)) return;
+#endif
     //LL_INFOS("WorldMap") << LL_ENDL;
     mSLURLRegionName = region_name;
     mSLURLRegionHandle = 0;
@@ -161,6 +167,10 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
     U32 agent_flags;
     msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
 
+#ifdef OPENSIM
+    if (agent_flags != LAYER_FLAG && hypergrid_processExactNamedRegionResponse(msg, agent_flags)) return;
+#endif
+
     // There's only one flag that we ever use here
     if (agent_flags != LAYER_FLAG)
     {
diff --git a/indra/newview/llworldmapmessage.fs.c++ b/indra/newview/llworldmapmessage.fs.c++
new file mode 100644
index 0000000000..5fc4d02415
--- /dev/null
+++ b/indra/newview/llworldmapmessage.fs.c++
@@ -0,0 +1,185 @@
+// potential workaround for hop://grid:port/Partial/x/y/z resolution
+// 2024.04.30 humbletim
+
+// notes:
+//   - exact MapNameRequests are sent flagless here (not using LAYER_FLAG)
+//     - this is to avoid triggering OpenSim code paths that modify result names
+//     - only affects LLWorldMapMessage->sendNamedRegionRequest(name, callback, ...)
+//     - in particular where a grid hosts overlapping names, hop Region matching may work better
+
+
+#include "llworldmapmessage.fs.h"
+
+#include <regex>
+#include <string>
+
+#include "llagent.h"
+#include "llcommon.h"
+#include "llsingleton.h"
+#include "llworldmap.h" // grid_to_region_handle
+#include "llworldmapmessage.h"
+#include "message.h"
+
+#include "llnotificationsutil.h"
+
+#define htxhop_log(format, ...)                                                                                  \
+    {                                                                                                            \
+        fprintf(stderr, format "\n", __VA_ARGS__);                                                               \
+        fflush(stderr);                                                                                          \
+        LLNotificationsUtil::add("ChatSystemMessageTip", LLSD().with("MESSAGE", llformat(format, __VA_ARGS__))); \
+        LL_WARNS("GridManager") << llformat(format, __VA_ARGS__) << LL_ENDL;                                     \
+    }
+
+#include "llviewercontrol.h"
+
+inline std::string extract_region(std::string const& s)
+{
+    static auto const& patterns = {
+        std::regex { R"(/ ([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "slash space" embedding...
+        std::regex { R"(([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "grid:port:region" embedding...
+    };
+    std::smatch match_results;
+    std::string ls { s };
+    LLStringUtil::toLower(ls);
+    for (auto const& pattern : patterns) {
+        if (std::regex_search(ls, match_results, pattern)) {
+            return match_results[1].str();
+        }
+    }
+    return {};
+}
+// int main() {
+//     for (const auto& s : {
+//         "http://hg.osgrid.org:80/ Vue North",
+//         "hop://hg.osgrid.org:80/ Vue North",
+//         "hg.osgrid.org:80/ Vue North",
+//         "hg.osgrid.org:80:Vue North",
+//         "hg.osgrid.org:80/Vue North",
+//     }) fprintf(stderr, "'%s' = '%s'\n", s, extract_region(s).c_str());fflush(stderr);
+//     return 0;
+// }
+
+static LLCachedControl<S32> htxhop_flags(gSavedSettings, "htxhop_flags", 0, "default: 0\nLAYER_FLAG: 2\n");
+#define htxhop_debug_setting_disable (+htxhop_flags == 2)
+
+// helper to encapsulate Region Map Block responses
+struct _MapBlock {
+    S32 index {};
+    U16 x_regions {}, y_regions {}, x_size { REGION_WIDTH_UNITS }, y_size { REGION_WIDTH_UNITS };
+    std::string name {};
+    U8 accesscode {};
+    U32 region_flags {};
+    LLUUID image_id {};
+
+    inline U32 x_world() const { return (U32)(x_regions)*REGION_WIDTH_UNITS; }
+    inline U32 y_world() const { return (U32)(y_regions)*REGION_WIDTH_UNITS; }
+    inline U64 region_handle() const { return grid_to_region_handle(x_regions, y_regions); }
+
+    // see: LLWorldMapMessage::processMapBlockReply
+    _MapBlock(LLMessageSystem* msg, S32 block)
+        : index(block)
+    {
+        msg->getU16Fast(_PREHASH_Data, _PREHASH_X, x_regions, block);
+        msg->getU16Fast(_PREHASH_Data, _PREHASH_Y, y_regions, block);
+        msg->getStringFast(_PREHASH_Data, _PREHASH_Name, name, block);
+        msg->getU8Fast(_PREHASH_Data, _PREHASH_Access, accesscode, block);
+        msg->getU32Fast(_PREHASH_Data, _PREHASH_RegionFlags, region_flags, block);
+        //        msg->getU8Fast(_PREHASH_Data, _PREHASH_WaterHeight, water_height, block);
+        //        msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block);
+        msg->getUUIDFast(_PREHASH_Data, _PREHASH_MapImageID, image_id, block);
+        // <FS:CR> Aurora Sim
+        if (msg->getNumberOfBlocksFast(_PREHASH_Size) > 0) {
+            msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeX, x_size, block);
+            msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeY, y_size, block);
+        }
+        if (x_size == 0 || (x_size % 16) != 0 || (y_size % 16) != 0) {
+            x_size = 256;
+            y_size = 256;
+        }
+        // </FS:CR> Aurora Sim
+    }
+};
+
+#define EXACT_FLAG 0x00000000
+
+// see: LLWorldMapMessage::sendNamedRegionRequest
+void _hypergrid_sendMapNameRequest(std::string const& region_name, U32 flags)
+{
+    LLMessageSystem* msg = gMessageSystem;
+    msg->newMessageFast(_PREHASH_MapNameRequest);
+    msg->nextBlockFast(_PREHASH_AgentData);
+    msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+    msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    msg->addU32Fast(_PREHASH_Flags, flags);
+    msg->addU32Fast(_PREHASH_EstateID, 0); // Filled in on sim
+    msg->addBOOLFast(_PREHASH_Godlike, FALSE); // Filled in on sim
+    msg->nextBlockFast(_PREHASH_NameData);
+    msg->addStringFast(_PREHASH_Name, region_name);
+    gAgent.sendReliableMessage();
+}
+
+using url_callback_t = std::function<void(uint64_t region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>;
+struct _AdoptedRegionNameQuery {
+    std::string key;
+    std::string region_name;
+    url_callback_t arbitrary_callback;
+    std::string arbitrary_slurl;
+    bool arbitrary_teleport;
+};
+// map extracted region names => pending query entries
+static std::map<std::string, _AdoptedRegionNameQuery> _region_name_queries;
+
+bool hypergrid_sendExactNamedRegionRequest(std::string const& region_name, url_callback_t const& callback, std::string const& callback_url,
+    bool teleport)
+{
+    if (htxhop_debug_setting_disable || !callback)
+        return false;
+    auto key = extract_region(region_name);
+    if (key.empty())
+        return false;
+    _region_name_queries[key] = { key, region_name, callback, callback_url, teleport };
+    htxhop_log("[xxHTxx] Send Region Name '%s' (key: %s)", region_name.c_str(), key.c_str());
+    _hypergrid_sendMapNameRequest(region_name, EXACT_FLAG);
+    return true;
+}
+
+bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags)
+{
+    if (htxhop_debug_setting_disable || !msg)
+        return false;
+    // NOTE: we assume only agent_flags have been read from msg so far
+    S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data);
+
+    std::vector<_MapBlock> blocks;
+    blocks.reserve(num_blocks);
+    for (int b = 0; b < num_blocks; b++) {
+        blocks.emplace_back(msg, b);
+    }
+    /* EXPIRE:>=2024-05-10 */ for (auto const& _block : blocks)
+        htxhop_log("#%02d key='%s' block.name='%s' block.region_handle=%llu", _block.index, extract_region(_block.name).c_str(),
+            _block.name.c_str(), _block.region_handle());
+
+    // special case: handle singular result w/empty name tho valid region handle AND singular pending query as a match
+    // (might be that a landing area / redirect hop URL is coming back: "^hop://grid:port/$", which extract_region's into "")
+    bool solo_result = blocks.size() == 2 && blocks[0].region_handle() && extract_region(blocks[0].name).empty() && !blocks[1].region_handle();
+    if (solo_result && _region_name_queries.size() == 1) {
+        htxhop_log("applying first block as redirect; region_handle: %llu", blocks[0].region_handle());
+        blocks[0].name = _region_name_queries.begin()->second.region_name;
+    }
+
+    for (auto const& _block : blocks) {
+        auto key = extract_region(_block.name);
+        if (key.empty())
+            continue;
+        auto idx = _region_name_queries.find(key);
+        if (idx == _region_name_queries.end())
+            continue;
+        auto pending = idx->second;
+        htxhop_log("[xxHTxx] Recv Region Name '%s' (key: %s) block.name='%s' block.region_handle=%llu)", pending.region_name.c_str(),
+            pending.key.c_str(), _block.name.c_str(), _block.region_handle());
+        _region_name_queries.erase(idx);
+        pending.arbitrary_callback(_block.region_handle(), pending.arbitrary_slurl, _block.image_id, pending.arbitrary_teleport);
+        return true;
+    }
+    return false;
+}
diff --git a/indra/newview/llworldmapmessage.fs.h b/indra/newview/llworldmapmessage.fs.h
new file mode 100644
index 0000000000..22a54dc00f
--- /dev/null
+++ b/indra/newview/llworldmapmessage.fs.h
@@ -0,0 +1,13 @@
+// NOTE: optional header file in case wanting to integrate as .h/.cpp
+#pragma once
+#include <cstdint>
+#include <functional>
+#include <string>
+class LLMessageSystem;
+class LLUUID;
+bool hypergrid_sendExactNamedRegionRequest(
+    std::string const& region_name,
+    std::function<void(uint64_t region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)> const& callback,
+    std::string const& callback_url,
+    bool teleport);
+bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, uint32_t agent_flags);

From 61f7c7e08f4eb0104cd0185c9fe656e7b48c84d1 Mon Sep 17 00:00:00 2001
From: tim <humbletim@gmail.com>
Date: Mon, 27 May 2024 15:25:06 -0400
Subject: [PATCH 24/42] cleanup; refactor code units per CR feedback

---
 indra/newview/CMakeLists.txt                  |  2 +
 ...apmessage.fs.c++ => fsworldmapmessage.cpp} | 55 ++++++-------------
 ...rldmapmessage.fs.h => fsworldmapmessage.h} | 11 +++-
 indra/newview/llworldmapmessage.cpp           | 22 +++++---
 4 files changed, 42 insertions(+), 48 deletions(-)
 rename indra/newview/{llworldmapmessage.fs.c++ => fsworldmapmessage.cpp} (76%)
 rename indra/newview/{llworldmapmessage.fs.h => fsworldmapmessage.h} (78%)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 54b9fa09be..f82e724340 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -167,6 +167,7 @@ set(viewer_SOURCE_FILES
     fsscriptlibrary.cpp
     fsscrolllistctrl.cpp
     fsslurlcommand.cpp
+    fsworldmapmessage.cpp
     groupchatlistener.cpp
     lggbeamcolormapfloater.cpp
     lggbeammapfloater.cpp
@@ -960,6 +961,7 @@ set(viewer_HEADER_FILES
     fsscrolllistctrl.h
     fsslurl.h
     fsslurlcommand.h
+    fsworldmapmessage.h
     groupchatlistener.h
     llaccountingcost.h
     lggbeamcolormapfloater.h
diff --git a/indra/newview/llworldmapmessage.fs.c++ b/indra/newview/fsworldmapmessage.cpp
similarity index 76%
rename from indra/newview/llworldmapmessage.fs.c++
rename to indra/newview/fsworldmapmessage.cpp
index 5fc4d02415..14aa758d51 100644
--- a/indra/newview/llworldmapmessage.fs.c++
+++ b/indra/newview/fsworldmapmessage.cpp
@@ -8,29 +8,19 @@
 //     - in particular where a grid hosts overlapping names, hop Region matching may work better
 
 
-#include "llworldmapmessage.fs.h"
+#include "fsworldmapmessage.h"
 
 #include <regex>
 #include <string>
 
-#include "llagent.h"
 #include "llcommon.h"
+#include "llagent.h"
 #include "llsingleton.h"
 #include "llworldmap.h" // grid_to_region_handle
 #include "llworldmapmessage.h"
 #include "message.h"
 
-#include "llnotificationsutil.h"
-
-#define htxhop_log(format, ...)                                                                                  \
-    {                                                                                                            \
-        fprintf(stderr, format "\n", __VA_ARGS__);                                                               \
-        fflush(stderr);                                                                                          \
-        LLNotificationsUtil::add("ChatSystemMessageTip", LLSD().with("MESSAGE", llformat(format, __VA_ARGS__))); \
-        LL_WARNS("GridManager") << llformat(format, __VA_ARGS__) << LL_ENDL;                                     \
-    }
-
-#include "llviewercontrol.h"
+#define htxhop_log(format, ...) LL_DEBUGS("GridManager") << llformat(format, __VA_ARGS__) << LL_ENDL;
 
 inline std::string extract_region(std::string const& s)
 {
@@ -48,19 +38,6 @@ inline std::string extract_region(std::string const& s)
     }
     return {};
 }
-// int main() {
-//     for (const auto& s : {
-//         "http://hg.osgrid.org:80/ Vue North",
-//         "hop://hg.osgrid.org:80/ Vue North",
-//         "hg.osgrid.org:80/ Vue North",
-//         "hg.osgrid.org:80:Vue North",
-//         "hg.osgrid.org:80/Vue North",
-//     }) fprintf(stderr, "'%s' = '%s'\n", s, extract_region(s).c_str());fflush(stderr);
-//     return 0;
-// }
-
-static LLCachedControl<S32> htxhop_flags(gSavedSettings, "htxhop_flags", 0, "default: 0\nLAYER_FLAG: 2\n");
-#define htxhop_debug_setting_disable (+htxhop_flags == 2)
 
 // helper to encapsulate Region Map Block responses
 struct _MapBlock {
@@ -132,21 +109,24 @@ static std::map<std::string, _AdoptedRegionNameQuery> _region_name_queries;
 bool hypergrid_sendExactNamedRegionRequest(std::string const& region_name, url_callback_t const& callback, std::string const& callback_url,
     bool teleport)
 {
-    if (htxhop_debug_setting_disable || !callback)
+    if (!callback) {
         return false;
+    }
     auto key = extract_region(region_name);
-    if (key.empty())
+    if (key.empty()) {
         return false;
+    }
     _region_name_queries[key] = { key, region_name, callback, callback_url, teleport };
-    htxhop_log("[xxHTxx] Send Region Name '%s' (key: %s)", region_name.c_str(), key.c_str());
+    htxhop_log("Send Region Name '%s' (key: %s)", region_name.c_str(), key.c_str());
     _hypergrid_sendMapNameRequest(region_name, EXACT_FLAG);
     return true;
 }
 
 bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags)
 {
-    if (htxhop_debug_setting_disable || !msg)
+    if (!msg) {
         return false;
+    }
     // NOTE: we assume only agent_flags have been read from msg so far
     S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data);
 
@@ -155,10 +135,9 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f
     for (int b = 0; b < num_blocks; b++) {
         blocks.emplace_back(msg, b);
     }
-    /* EXPIRE:>=2024-05-10 */ for (auto const& _block : blocks)
-        htxhop_log("#%02d key='%s' block.name='%s' block.region_handle=%llu", _block.index, extract_region(_block.name).c_str(),
-            _block.name.c_str(), _block.region_handle());
-
+    for (auto const& _block : blocks) {
+        htxhop_log("#%02d key='%s' block.name='%s' block.region_handle=%llu", _block.index, extract_region(_block.name).c_str(), _block.name.c_str(), _block.region_handle());
+    }
     // special case: handle singular result w/empty name tho valid region handle AND singular pending query as a match
     // (might be that a landing area / redirect hop URL is coming back: "^hop://grid:port/$", which extract_region's into "")
     bool solo_result = blocks.size() == 2 && blocks[0].region_handle() && extract_region(blocks[0].name).empty() && !blocks[1].region_handle();
@@ -169,13 +148,15 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f
 
     for (auto const& _block : blocks) {
         auto key = extract_region(_block.name);
-        if (key.empty())
+        if (key.empty()) {
             continue;
+        }
         auto idx = _region_name_queries.find(key);
-        if (idx == _region_name_queries.end())
+        if (idx == _region_name_queries.end()) {
             continue;
+        }
         auto pending = idx->second;
-        htxhop_log("[xxHTxx] Recv Region Name '%s' (key: %s) block.name='%s' block.region_handle=%llu)", pending.region_name.c_str(),
+        htxhop_log("Recv Region Name '%s' (key: %s) block.name='%s' block.region_handle=%llu)", pending.region_name.c_str(),
             pending.key.c_str(), _block.name.c_str(), _block.region_handle());
         _region_name_queries.erase(idx);
         pending.arbitrary_callback(_block.region_handle(), pending.arbitrary_slurl, _block.image_id, pending.arbitrary_teleport);
diff --git a/indra/newview/llworldmapmessage.fs.h b/indra/newview/fsworldmapmessage.h
similarity index 78%
rename from indra/newview/llworldmapmessage.fs.h
rename to indra/newview/fsworldmapmessage.h
index 22a54dc00f..8bbd7ba9e0 100644
--- a/indra/newview/llworldmapmessage.fs.h
+++ b/indra/newview/fsworldmapmessage.h
@@ -1,5 +1,10 @@
-// NOTE: optional header file in case wanting to integrate as .h/.cpp
-#pragma once
+/*
+ * @file fsworldmapmessage.h
+ */
+
+#ifndef FS_WORLDMAPMESSAGE_H
+#define FS_WORLDMAPMESSAGE_H
+
 #include <cstdint>
 #include <functional>
 #include <string>
@@ -11,3 +16,5 @@ bool hypergrid_sendExactNamedRegionRequest(
     std::string const& callback_url,
     bool teleport);
 bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, uint32_t agent_flags);
+
+#endif // FS_WORLDMAPMESSAGE_H
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index c0ddd453dd..879fc245df 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -35,10 +35,8 @@
 
 // <FS:CR> Aurora Sim
 #include "llviewernetwork.h"
-#ifdef OPENSIM
-#include "llworldmapmessage.fs.c++"
-#endif
 // </FS:CR> Aurora Sim
+#include "fsworldmapmessage.h" // <FS:humbletim/> FIRE-31368: [OPENSIM] ... Search returns more than one result
 
 const U32 LAYER_FLAG = 2;
 
@@ -102,9 +100,12 @@ void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name,
         const std::string& callback_url,
         bool teleport)  // immediately teleport when result returned
 {
-#ifdef OPENSIM
-    if (hypergrid_sendExactNamedRegionRequest(region_name, callback, callback_url, teleport)) return;
-#endif
+    // <FS:humbletim> FIRE-31368: [OPENSIM] ... Search returns more than one result
+    if (hypergrid_sendExactNamedRegionRequest(region_name, callback, callback_url, teleport)) {
+        return;
+    }
+    // </FS:humbletim>
+
     //LL_INFOS("WorldMap") << LL_ENDL;
     mSLURLRegionName = region_name;
     mSLURLRegionHandle = 0;
@@ -167,9 +168,12 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
     U32 agent_flags;
     msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
 
-#ifdef OPENSIM
-    if (agent_flags != LAYER_FLAG && hypergrid_processExactNamedRegionResponse(msg, agent_flags)) return;
-#endif
+    // <FS:humbletim> FIRE-31368: [OPENSIM] ... Search returns more than one result
+    if (hypergrid_processExactNamedRegionResponse(msg, agent_flags)) {
+        return;
+    }
+    // </FS:humbletim>
+
 
     // There's only one flag that we ever use here
     if (agent_flags != LAYER_FLAG)

From 2d59292228c4cd6b2550cce89700bbb7c55c31bf Mon Sep 17 00:00:00 2001
From: tim <humbletim@gmail.com>
Date: Mon, 27 May 2024 18:33:58 -0400
Subject: [PATCH 25/42] prefer constexpr over defines; add runtime isInOpenSim
 check

---
 indra/newview/fsworldmapmessage.cpp | 8 +++++---
 indra/newview/llworldmapmessage.cpp | 4 ----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/indra/newview/fsworldmapmessage.cpp b/indra/newview/fsworldmapmessage.cpp
index 14aa758d51..7e4ee41ac7 100644
--- a/indra/newview/fsworldmapmessage.cpp
+++ b/indra/newview/fsworldmapmessage.cpp
@@ -17,6 +17,7 @@
 #include "llagent.h"
 #include "llsingleton.h"
 #include "llworldmap.h" // grid_to_region_handle
+#include "fsgridhandler.h"
 #include "llworldmapmessage.h"
 #include "message.h"
 
@@ -77,7 +78,8 @@ struct _MapBlock {
     }
 };
 
-#define EXACT_FLAG 0x00000000
+constexpr U32 EXACT_FLAG = 0x00000000;
+constexpr U32 LAYER_FLAG = 0x00000002;
 
 // see: LLWorldMapMessage::sendNamedRegionRequest
 void _hypergrid_sendMapNameRequest(std::string const& region_name, U32 flags)
@@ -109,7 +111,7 @@ static std::map<std::string, _AdoptedRegionNameQuery> _region_name_queries;
 bool hypergrid_sendExactNamedRegionRequest(std::string const& region_name, url_callback_t const& callback, std::string const& callback_url,
     bool teleport)
 {
-    if (!callback) {
+    if (!LLGridManager::instance().isInOpenSim() || !callback) {
         return false;
     }
     auto key = extract_region(region_name);
@@ -124,7 +126,7 @@ bool hypergrid_sendExactNamedRegionRequest(std::string const& region_name, url_c
 
 bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags)
 {
-    if (!msg) {
+    if (!LLGridManager::instance().isInOpenSim() || !msg || agent_flags & LAYER_FLAG) {
         return false;
     }
     // NOTE: we assume only agent_flags have been read from msg so far
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index 879fc245df..6c61da7e96 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -105,7 +105,6 @@ void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name,
         return;
     }
     // </FS:humbletim>
-
     //LL_INFOS("WorldMap") << LL_ENDL;
     mSLURLRegionName = region_name;
     mSLURLRegionHandle = 0;
@@ -167,14 +166,11 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
     }
     U32 agent_flags;
     msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
-
     // <FS:humbletim> FIRE-31368: [OPENSIM] ... Search returns more than one result
     if (hypergrid_processExactNamedRegionResponse(msg, agent_flags)) {
         return;
     }
     // </FS:humbletim>
-
-
     // There's only one flag that we ever use here
     if (agent_flags != LAYER_FLAG)
     {

From 6f325f91d7e3ab62ba364445a1d1bb8ba9ca2499 Mon Sep 17 00:00:00 2001
From: tim <humbletim@gmail.com>
Date: Mon, 27 May 2024 18:40:30 -0400
Subject: [PATCH 26/42] +-newline

---
 indra/newview/llworldmapmessage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index 6c61da7e96..5376a7fc8f 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -171,6 +171,7 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
         return;
     }
     // </FS:humbletim>
+
     // There's only one flag that we ever use here
     if (agent_flags != LAYER_FLAG)
     {

From 4b02d6f1ef1094390eec5842693e5b2d1f3a3950 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Thu, 30 May 2024 16:19:34 +0100
Subject: [PATCH 27/42] Add FS header blocks

---
 indra/newview/fsworldmapmessage.cpp | 27 +++++++++++++++++++++++++++
 indra/newview/fsworldmapmessage.h   | 25 ++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/indra/newview/fsworldmapmessage.cpp b/indra/newview/fsworldmapmessage.cpp
index 7e4ee41ac7..84dd20a72d 100644
--- a/indra/newview/fsworldmapmessage.cpp
+++ b/indra/newview/fsworldmapmessage.cpp
@@ -1,3 +1,30 @@
+/**
+ * @file fsworldmapmessage.cpp
+ * @brief FS specific extensions to world map handling for OpenSim
+ *
+ * $LicenseInfo:firstyear=2024&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2024, The Phoenix Firestorm Project, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ * 
+ */
 // potential workaround for hop://grid:port/Partial/x/y/z resolution
 // 2024.04.30 humbletim
 
diff --git a/indra/newview/fsworldmapmessage.h b/indra/newview/fsworldmapmessage.h
index 8bbd7ba9e0..9262fbaec4 100644
--- a/indra/newview/fsworldmapmessage.h
+++ b/indra/newview/fsworldmapmessage.h
@@ -1,5 +1,28 @@
-/*
+/**
  * @file fsworldmapmessage.h
+ * @brief FS specific extensions to world map handling for OpenSim
+ *
+ * $LicenseInfo:firstyear=2024&license=fsviewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (C) 2024, The Phoenix Firestorm Project, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
  */
 
 #ifndef FS_WORLDMAPMESSAGE_H

From c5fd57d3bd2297cae621e32af9f119baf8db1a4f Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Thu, 30 May 2024 16:20:56 +0100
Subject: [PATCH 28/42] FIRE-33922 - starlight skin fixes by ScentualLust

---
 indra/newview/skins/starlight/textures/textures.xml    | 4 ++--
 indra/newview/skins/starlightcui/textures/textures.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/starlight/textures/textures.xml b/indra/newview/skins/starlight/textures/textures.xml
index 52eecf460e..dd8ffeb6f8 100755
--- a/indra/newview/skins/starlight/textures/textures.xml
+++ b/indra/newview/skins/starlight/textures/textures.xml
@@ -868,8 +868,8 @@ with the same filename but different name
   <texture name="Inv_OutboxClosed"		file_name="icons/Inv_SysClosed.png" />
   <texture name="Inv_SettingsOpen"		file_name="icons/Inv_SysOpen.png" />
   <texture name="Inv_SettingsClosed"	file_name="icons/Inv_SysClosed.png" />
-  <texture name="Inv_MaterialsClosed"	file_name="icons/Inv_SysOpen.png" />
-  <texture name="Inv_MaterialsOpen"		file_name="icons/Inv_SysClosed.png" />
+  <texture name="Inv_MaterialsOpen"		file_name="icons/Inv_SysOpen.png" />
+  <texture name="Inv_MaterialsClosed"	file_name="icons/Inv_SysClosed.png" />
   <texture name="TabIcon_Translate_Off" file_name="taskpanel/translate_icon_24x24.png" preload="false" />
   <texture name="ao_toggle_18" file_name="toolbar_icons/animation_override.png" preload="false" />
   <texture name="groundsit" file_name="toolbar_icons/groundsit.png" preload="true" />
diff --git a/indra/newview/skins/starlightcui/textures/textures.xml b/indra/newview/skins/starlightcui/textures/textures.xml
index 9e893a3425..8927775dd9 100755
--- a/indra/newview/skins/starlightcui/textures/textures.xml
+++ b/indra/newview/skins/starlightcui/textures/textures.xml
@@ -868,8 +868,8 @@ with the same filename but different name
   <texture name="Inv_OutboxClosed"		file_name="icons/Inv_SysClosed.png" />
   <texture name="Inv_SettingsOpen"		file_name="icons/Inv_SysOpen.png" />
   <texture name="Inv_SettingsClosed"	file_name="icons/Inv_SysClosed.png" />
-  <texture name="Inv_MaterialsClosed"	file_name="icons/Inv_SysOpen.png" />
-  <texture name="Inv_MaterialsOpen"		file_name="icons/Inv_SysClosed.png" />
+  <texture name="Inv_MaterialsOpen"		file_name="icons/Inv_SysOpen.png" />
+  <texture name="Inv_MaterialsClosed"	file_name="icons/Inv_SysClosed.png" />
   <texture name="TabIcon_Translate_Off" file_name="taskpanel/translate_icon_24x24.png" preload="false" />
   <texture name="ao_toggle_18" file_name="toolbar_icons/animation_override.png" preload="false" />
   <texture name="groundsit" file_name="toolbar_icons/groundsit.png" preload="true" />

From ac0d6afb63faafa7b225b62db212ad920199f79b Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 30 May 2024 21:40:53 +0200
Subject: [PATCH 29/42] Clean Hypergrid region name handling a bit and only
 include in OpenSim builds

---
 indra/newview/fsworldmapmessage.cpp | 82 +++++++++++++++++------------
 indra/newview/fsworldmapmessage.h   | 17 +++---
 indra/newview/llworldmapmessage.cpp | 10 +++-
 3 files changed, 67 insertions(+), 42 deletions(-)

diff --git a/indra/newview/fsworldmapmessage.cpp b/indra/newview/fsworldmapmessage.cpp
index 84dd20a72d..48e1411142 100644
--- a/indra/newview/fsworldmapmessage.cpp
+++ b/indra/newview/fsworldmapmessage.cpp
@@ -34,23 +34,21 @@
 //     - only affects LLWorldMapMessage->sendNamedRegionRequest(name, callback, ...)
 //     - in particular where a grid hosts overlapping names, hop Region matching may work better
 
+#include "llviewerprecompiledheaders.h"
 
+#ifdef OPENSIM
 #include "fsworldmapmessage.h"
 
-#include <regex>
-#include <string>
-
-#include "llcommon.h"
 #include "llagent.h"
-#include "llsingleton.h"
 #include "llworldmap.h" // grid_to_region_handle
 #include "fsgridhandler.h"
 #include "llworldmapmessage.h"
 #include "message.h"
+#include <regex>
 
 #define htxhop_log(format, ...) LL_DEBUGS("GridManager") << llformat(format, __VA_ARGS__) << LL_ENDL;
 
-inline std::string extract_region(std::string const& s)
+static inline std::string extract_region(const std::string& s)
 {
     static auto const& patterns = {
         std::regex { R"(/ ([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "slash space" embedding...
@@ -59,8 +57,10 @@ inline std::string extract_region(std::string const& s)
     std::smatch match_results;
     std::string ls { s };
     LLStringUtil::toLower(ls);
-    for (auto const& pattern : patterns) {
-        if (std::regex_search(ls, match_results, pattern)) {
+    for (const auto& pattern : patterns)
+    {
+        if (std::regex_search(ls, match_results, pattern))
+        {
             return match_results[1].str();
         }
     }
@@ -68,7 +68,8 @@ inline std::string extract_region(std::string const& s)
 }
 
 // helper to encapsulate Region Map Block responses
-struct _MapBlock {
+struct _MapBlock
+{
     S32 index {};
     U16 x_regions {}, y_regions {}, x_size { REGION_WIDTH_UNITS }, y_size { REGION_WIDTH_UNITS };
     std::string name {};
@@ -93,11 +94,13 @@ struct _MapBlock {
         //        msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block);
         msg->getUUIDFast(_PREHASH_Data, _PREHASH_MapImageID, image_id, block);
         // <FS:CR> Aurora Sim
-        if (msg->getNumberOfBlocksFast(_PREHASH_Size) > 0) {
+        if (msg->getNumberOfBlocksFast(_PREHASH_Size) > 0)
+        {
             msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeX, x_size, block);
             msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeY, y_size, block);
         }
-        if (x_size == 0 || (x_size % 16) != 0 || (y_size % 16) != 0) {
+        if (x_size == 0 || (x_size % 16) != 0 || (y_size % 16) != 0)
+        {
             x_size = 256;
             y_size = 256;
         }
@@ -109,40 +112,43 @@ constexpr U32 EXACT_FLAG = 0x00000000;
 constexpr U32 LAYER_FLAG = 0x00000002;
 
 // see: LLWorldMapMessage::sendNamedRegionRequest
-void _hypergrid_sendMapNameRequest(std::string const& region_name, U32 flags)
+static void _hypergrid_sendMapNameRequest(const std::string& region_name, U32 flags)
 {
     LLMessageSystem* msg = gMessageSystem;
     msg->newMessageFast(_PREHASH_MapNameRequest);
     msg->nextBlockFast(_PREHASH_AgentData);
-    msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-    msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+    msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
     msg->addU32Fast(_PREHASH_Flags, flags);
     msg->addU32Fast(_PREHASH_EstateID, 0); // Filled in on sim
-    msg->addBOOLFast(_PREHASH_Godlike, FALSE); // Filled in on sim
+    msg->addBOOLFast(_PREHASH_Godlike, false); // Filled in on sim
     msg->nextBlockFast(_PREHASH_NameData);
     msg->addStringFast(_PREHASH_Name, region_name);
     gAgent.sendReliableMessage();
 }
 
-using url_callback_t = std::function<void(uint64_t region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>;
-struct _AdoptedRegionNameQuery {
-    std::string key;
-    std::string region_name;
+struct _AdoptedRegionNameQuery
+{
+    std::string key{};
+    std::string region_name{};
     url_callback_t arbitrary_callback;
-    std::string arbitrary_slurl;
-    bool arbitrary_teleport;
+    std::string arbitrary_slurl{};
+    bool arbitrary_teleport{ false };
 };
+
 // map extracted region names => pending query entries
 static std::map<std::string, _AdoptedRegionNameQuery> _region_name_queries;
 
-bool hypergrid_sendExactNamedRegionRequest(std::string const& region_name, url_callback_t const& callback, std::string const& callback_url,
-    bool teleport)
+bool hypergrid_sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport)
 {
-    if (!LLGridManager::instance().isInOpenSim() || !callback) {
+    if (!LLGridManager::instance().isInOpenSim() || !callback)
+    {
         return false;
     }
+
     auto key = extract_region(region_name);
-    if (key.empty()) {
+    if (key.empty())
+    {
         return false;
     }
     _region_name_queries[key] = { key, region_name, callback, callback_url, teleport };
@@ -153,7 +159,8 @@ bool hypergrid_sendExactNamedRegionRequest(std::string const& region_name, url_c
 
 bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags)
 {
-    if (!LLGridManager::instance().isInOpenSim() || !msg || agent_flags & LAYER_FLAG) {
+    if (!LLGridManager::instance().isInOpenSim() || !msg || agent_flags & LAYER_FLAG)
+    {
         return false;
     }
     // NOTE: we assume only agent_flags have been read from msg so far
@@ -161,30 +168,38 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f
 
     std::vector<_MapBlock> blocks;
     blocks.reserve(num_blocks);
-    for (int b = 0; b < num_blocks; b++) {
+    for (S32 b = 0; b < num_blocks; b++)
+    {
         blocks.emplace_back(msg, b);
     }
-    for (auto const& _block : blocks) {
+    for (const auto& _block : blocks)
+    {
         htxhop_log("#%02d key='%s' block.name='%s' block.region_handle=%llu", _block.index, extract_region(_block.name).c_str(), _block.name.c_str(), _block.region_handle());
     }
     // special case: handle singular result w/empty name tho valid region handle AND singular pending query as a match
     // (might be that a landing area / redirect hop URL is coming back: "^hop://grid:port/$", which extract_region's into "")
     bool solo_result = blocks.size() == 2 && blocks[0].region_handle() && extract_region(blocks[0].name).empty() && !blocks[1].region_handle();
-    if (solo_result && _region_name_queries.size() == 1) {
+    if (solo_result && _region_name_queries.size() == 1)
+    {
         htxhop_log("applying first block as redirect; region_handle: %llu", blocks[0].region_handle());
         blocks[0].name = _region_name_queries.begin()->second.region_name;
     }
 
-    for (auto const& _block : blocks) {
+    for (const auto& _block : blocks)
+    {
         auto key = extract_region(_block.name);
-        if (key.empty()) {
+        if (key.empty())
+        {
             continue;
         }
+
         auto idx = _region_name_queries.find(key);
-        if (idx == _region_name_queries.end()) {
+        if (idx == _region_name_queries.end())
+        {
             continue;
         }
-        auto pending = idx->second;
+
+        const auto& pending = idx->second;
         htxhop_log("Recv Region Name '%s' (key: %s) block.name='%s' block.region_handle=%llu)", pending.region_name.c_str(),
             pending.key.c_str(), _block.name.c_str(), _block.region_handle());
         _region_name_queries.erase(idx);
@@ -193,3 +208,4 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f
     }
     return false;
 }
+#endif
diff --git a/indra/newview/fsworldmapmessage.h b/indra/newview/fsworldmapmessage.h
index 9262fbaec4..2464ef15fd 100644
--- a/indra/newview/fsworldmapmessage.h
+++ b/indra/newview/fsworldmapmessage.h
@@ -28,16 +28,19 @@
 #ifndef FS_WORLDMAPMESSAGE_H
 #define FS_WORLDMAPMESSAGE_H
 
-#include <cstdint>
+#ifdef OPENSIM
+
+#include <stdtypes.h>
 #include <functional>
 #include <string>
+
 class LLMessageSystem;
 class LLUUID;
-bool hypergrid_sendExactNamedRegionRequest(
-    std::string const& region_name,
-    std::function<void(uint64_t region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)> const& callback,
-    std::string const& callback_url,
-    bool teleport);
-bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, uint32_t agent_flags);
 
+using url_callback_t = std::function<void(uint64_t region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>;
+
+bool hypergrid_sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport);
+bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags);
+
+#endif
 #endif // FS_WORLDMAPMESSAGE_H
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index 5376a7fc8f..bbd0da9895 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -101,9 +101,12 @@ void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name,
         bool teleport)  // immediately teleport when result returned
 {
     // <FS:humbletim> FIRE-31368: [OPENSIM] ... Search returns more than one result
-    if (hypergrid_sendExactNamedRegionRequest(region_name, callback, callback_url, teleport)) {
+#ifdef OPENSIM
+    if (hypergrid_sendExactNamedRegionRequest(region_name, callback, callback_url, teleport))
+    {
         return;
     }
+#endif
     // </FS:humbletim>
     //LL_INFOS("WorldMap") << LL_ENDL;
     mSLURLRegionName = region_name;
@@ -167,9 +170,12 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
     U32 agent_flags;
     msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
     // <FS:humbletim> FIRE-31368: [OPENSIM] ... Search returns more than one result
-    if (hypergrid_processExactNamedRegionResponse(msg, agent_flags)) {
+#ifdef OPENSIM
+    if (hypergrid_processExactNamedRegionResponse(msg, agent_flags))
+    {
         return;
     }
+#endif
     // </FS:humbletim>
 
     // There's only one flag that we ever use here

From 47c1fbea3e39b1826d0755499ce4f125f47aae70 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 31 May 2024 12:21:36 +0300
Subject: [PATCH 30/42] viewer#1600 Fixed being unable to delete links to worn
 objects

---
 indra/newview/llinventoryfunctions.cpp | 4 ++--
 indra/newview/llinventorygallery.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 61bfcc86e8..7dd70c8644 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -3375,7 +3375,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 
                 for (LLInventoryModel::item_array_t::value_type& item : items)
                 {
-                    if (get_is_item_worn(item))
+                    if (!item->getIsLinkType() && get_is_item_worn(item))
                     {
                         has_worn = true;
                         LLWearableType::EType type = item->getWearableType();
@@ -3395,7 +3395,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
                 }
             }
             LLViewerInventoryItem* item = gInventory.getItem(obj_id);
-            if (item && get_is_item_worn(item))
+            if (item && !item->getIsLinkType() && get_is_item_worn(item))
             {
                 has_worn = true;
                 LLWearableType::EType type = item->getWearableType();
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 6b25857068..b873c6f702 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1988,7 +1988,7 @@ void LLInventoryGallery::deleteSelection()
 
             for (LLInventoryModel::item_array_t::value_type& item : items)
             {
-                if (get_is_item_worn(item))
+                if (!item->getIsLinkType() && get_is_item_worn(item))
                 {
                     has_worn = true;
                     LLWearableType::EType type = item->getWearableType();
@@ -2009,7 +2009,7 @@ void LLInventoryGallery::deleteSelection()
         }
 
         LLViewerInventoryItem* item = gInventory.getItem(id);
-        if (item && get_is_item_worn(item))
+        if (item && !item->getIsLinkType() && get_is_item_worn(item))
         {
             has_worn = true;
             LLWearableType::EType type = item->getWearableType();            

From 32d9d4311829a7d5d6af46273221ff417e7901c4 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 31 May 2024 18:57:23 +0100
Subject: [PATCH 31/42] Fix crash due to invalidated reference use after erase.

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

diff --git a/indra/newview/fsworldmapmessage.cpp b/indra/newview/fsworldmapmessage.cpp
index 48e1411142..dfc6390c54 100644
--- a/indra/newview/fsworldmapmessage.cpp
+++ b/indra/newview/fsworldmapmessage.cpp
@@ -199,7 +199,7 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f
             continue;
         }
 
-        const auto& pending = idx->second;
+        auto pending = idx->second;
         htxhop_log("Recv Region Name '%s' (key: %s) block.name='%s' block.region_handle=%llu)", pending.region_name.c_str(),
             pending.key.c_str(), _block.name.c_str(), _block.region_handle());
         _region_name_queries.erase(idx);

From 0478229bcb1ca9580f89a92528b6a25824bae13b Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 31 May 2024 20:16:59 +0200
Subject: [PATCH 32/42] FIRE-33963 French translation update, by Laurent Bechir

---
 .../skins/default/xui/fr/floater_whitelist.xml  | 17 +++++++++++++++++
 .../skins/default/xui/fr/menu_viewer.xml        |  9 +++++++++
 .../xui/fr/panel_group_info_sidetray.xml        | 17 +++++++++++++----
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/fr/floater_whitelist.xml

diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist.xml b/indra/newview/skins/default/xui/fr/floater_whitelist.xml
new file mode 100644
index 0000000000..6d83b0c19f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_whitelist.xml
@@ -0,0 +1,17 @@
+<floater name="whitelist_floater" title="Whitelist Folders and Binaries">
+	<text name="whitelist_intro">
+Les antivirus et les anti-logiciels malveillants sont un élément essentiel d'une utilisation sûre de l'internet, mais ils peuvent causer toute une série de problèmes à la visionneuse.
+Pour réduire les interférences et améliorer la stabilité et les performances, nous conseillons vivement à tous les utilisateurs de veiller à ce qu'il y ait des exclusions (connues sous le nom de liste blanche) pour les dossiers et les programmes importants que la visionneuse utilise.
+
+Pour plus d'informations, visitez le site
+https://wiki.firestormviewer.org/antivirus_whitelisting
+	</text>
+	<text name="whitelist_folder_instruction">
+Pour vous simplifier la tâche, l'encadré ci-dessous indique les dossiers utilisés par la visionneuse.
+Veuillez les ajouter à vos exclusions de dossiers AV, comme indiqué sur la page wiki ci-dessus.
+	</text>
+	<text name="whitelist_exe_instruction">
+La case suivante indique le nom et le chemin d'accès complet des exécutables de la visionneuse.
+Ajoutez-les à vos exclusions d'exécutables AV comme indiqué dans le wiki ci-dessus.
+	</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index d71588baaf..c665dcebd1 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -267,8 +267,17 @@
 		<menu_item_call label="Horaires des classes Firestorm" name="Firestorm Classes Schedule"/>
 		<menu_item_call label="Calendrier des évènements Firestorm" name="Firestorm Events Calendar"/>
 		<menu_item_check label="Guide" name="How To"/>
+		<!-- <menu_item_call label="Aide Second Life" name="Second Life Help"/>-->
 		<menu_item_call label="Aide [CURRENT_GRID]" name="current_grid_help"/>
 		<menu_item_call label="À propos de [CURRENT_GRID]" name="current_grid_about"/>
+		<!-- <menu_item_call label="Tutoriels" name="Tutorial"/>
+		<menu_item_call label="Base de connaissance" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Forums communautaires" name="Community Forums"/>
+		<menu_item_call label="Portail d'assistance" name="Support portal"/>
+		<menu_item_call label="Nouvelles de [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>-->
+		<menu_item_call name="whitelist_folders" label="Conseils de liste blanche"/>
 		<menu_item_check label="Consulter l'état de la grille" name="Grid Status"/>
 		<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
 		<menu_item_call label="Signaler un problème" name="Report Bug"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
index 2bb67f774e..21dd703a9f 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
@@ -9,7 +9,10 @@
 	<panel.string name="leave_txt">Quitter</panel.string>
 	<layout_stack name="group_info_sidetray_main">
 		<layout_panel name="header_container">
-			<panel name="group_info_top"><line_editor label="Saisissez le nom de votre nouveau groupe ici" name="group_name_editor"/></panel>
+			<panel name="group_info_top">
+				<text_editor name="group_name" value="(Chargement ...)"/>
+				<line_editor label="Saisissez le nom de votre nouveau groupe ici" name="group_name_editor"/>
+			</panel>
 		</layout_panel>
 		<layout_panel name="group_info_content">
 			<layout_stack name="layout">
@@ -24,11 +27,17 @@
 				</layout_panel>
 			</layout_stack>
 			<layout_stack name="button_row_ls">
-				<layout_panel name="btn_chat_lp"><button label="Chat" name="btn_chat"/></layout_panel>
-				<layout_panel name="call_btn_lp"><button name="btn_call" label="Appel de groupe" tool_tip="Appeler ce groupe"/></layout_panel>
+				<layout_panel name="btn_activate_lp">
+					<button label="Activer" name="btn_activate" />
+				</layout_panel>
+				<layout_panel name="btn_chat_lp">
+					<button label="Chat" name="btn_chat"/>
+				</layout_panel>
+				<layout_panel name="call_btn_lp">
+					<button name="btn_call" label="Appel de groupe" tool_tip="Appeler ce groupe"/>
+				</layout_panel>
 				<layout_panel name="btn_apply_lp">
 					<button label="Enregistrer" label_selected="Enregistrer" name="btn_apply"/>
-					<button label="Créer un groupe" name="btn_create" tool_tip="Créer un nouveau groupe"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>

From ed1484a5136dba5a974495064b8e4195e1da82b7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 1 Jun 2024 12:31:49 +0200
Subject: [PATCH 33/42] Put Hypergrid handling in its own namespace

---
 indra/newview/fsworldmapmessage.cpp | 207 ++++++++++++++--------------
 indra/newview/fsworldmapmessage.h   |  11 +-
 indra/newview/llworldmapmessage.cpp |   4 +-
 3 files changed, 114 insertions(+), 108 deletions(-)

diff --git a/indra/newview/fsworldmapmessage.cpp b/indra/newview/fsworldmapmessage.cpp
index dfc6390c54..9d53bbf74c 100644
--- a/indra/newview/fsworldmapmessage.cpp
+++ b/indra/newview/fsworldmapmessage.cpp
@@ -48,98 +48,101 @@
 
 #define htxhop_log(format, ...) LL_DEBUGS("GridManager") << llformat(format, __VA_ARGS__) << LL_ENDL;
 
-static inline std::string extract_region(const std::string& s)
+namespace hypergrid
 {
-    static auto const& patterns = {
-        std::regex { R"(/ ([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "slash space" embedding...
-        std::regex { R"(([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "grid:port:region" embedding...
+    static inline std::string extract_region(const std::string& s)
+    {
+        static auto const& patterns = {
+            std::regex { R"(/ ([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "slash space" embedding...
+            std::regex { R"(([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "grid:port:region" embedding...
+        };
+        std::smatch match_results;
+        std::string ls{ s };
+        LLStringUtil::toLower(ls);
+        for (const auto& pattern : patterns)
+        {
+            if (std::regex_search(ls, match_results, pattern))
+            {
+                return match_results[1].str();
+            }
+        }
+        return {};
+    }
+
+    // helper to encapsulate Region Map Block responses
+    struct MapBlock
+    {
+        S32 index{};
+        U16 x_regions{}, y_regions{}, x_size{ REGION_WIDTH_UNITS }, y_size{ REGION_WIDTH_UNITS };
+        std::string name{};
+        U8 accesscode{};
+        U32 region_flags{};
+        LLUUID image_id{};
+
+        inline U32 x_world() const { return (U32)(x_regions)*REGION_WIDTH_UNITS; }
+        inline U32 y_world() const { return (U32)(y_regions)*REGION_WIDTH_UNITS; }
+        inline U64 region_handle() const { return grid_to_region_handle(x_regions, y_regions); }
+
+        // see: LLWorldMapMessage::processMapBlockReply
+        MapBlock(LLMessageSystem* msg, S32 block)
+            : index(block)
+        {
+            msg->getU16Fast(_PREHASH_Data, _PREHASH_X, x_regions, block);
+            msg->getU16Fast(_PREHASH_Data, _PREHASH_Y, y_regions, block);
+            msg->getStringFast(_PREHASH_Data, _PREHASH_Name, name, block);
+            msg->getU8Fast(_PREHASH_Data, _PREHASH_Access, accesscode, block);
+            msg->getU32Fast(_PREHASH_Data, _PREHASH_RegionFlags, region_flags, block);
+            //        msg->getU8Fast(_PREHASH_Data, _PREHASH_WaterHeight, water_height, block);
+            //        msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block);
+            msg->getUUIDFast(_PREHASH_Data, _PREHASH_MapImageID, image_id, block);
+            // <FS:CR> Aurora Sim
+            if (msg->getNumberOfBlocksFast(_PREHASH_Size) > 0)
+            {
+                msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeX, x_size, block);
+                msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeY, y_size, block);
+            }
+            if (x_size == 0 || (x_size % 16) != 0 || (y_size % 16) != 0)
+            {
+                x_size = 256;
+                y_size = 256;
+            }
+            // </FS:CR> Aurora Sim
+        }
     };
-    std::smatch match_results;
-    std::string ls { s };
-    LLStringUtil::toLower(ls);
-    for (const auto& pattern : patterns)
+
+    constexpr U32 EXACT_FLAG = 0x00000000;
+    constexpr U32 LAYER_FLAG = 0x00000002;
+
+    // see: LLWorldMapMessage::sendNamedRegionRequest
+    static void sendMapNameRequest(const std::string& region_name, U32 flags)
     {
-        if (std::regex_search(ls, match_results, pattern))
-        {
-            return match_results[1].str();
-        }
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessageFast(_PREHASH_MapNameRequest);
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+        msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
+        msg->addU32Fast(_PREHASH_Flags, flags);
+        msg->addU32Fast(_PREHASH_EstateID, 0); // Filled in on sim
+        msg->addBOOLFast(_PREHASH_Godlike, false); // Filled in on sim
+        msg->nextBlockFast(_PREHASH_NameData);
+        msg->addStringFast(_PREHASH_Name, region_name);
+        gAgent.sendReliableMessage();
     }
-    return {};
+
+    struct AdoptedRegionNameQuery
+    {
+        std::string key{};
+        std::string region_name{};
+        hypergrid::url_callback_t arbitrary_callback;
+        std::string arbitrary_slurl{};
+        bool arbitrary_teleport{ false };
+    };
+
+    // map extracted region names => pending query entries
+    static std::map<std::string, AdoptedRegionNameQuery> region_name_queries;
 }
 
-// helper to encapsulate Region Map Block responses
-struct _MapBlock
-{
-    S32 index {};
-    U16 x_regions {}, y_regions {}, x_size { REGION_WIDTH_UNITS }, y_size { REGION_WIDTH_UNITS };
-    std::string name {};
-    U8 accesscode {};
-    U32 region_flags {};
-    LLUUID image_id {};
-
-    inline U32 x_world() const { return (U32)(x_regions)*REGION_WIDTH_UNITS; }
-    inline U32 y_world() const { return (U32)(y_regions)*REGION_WIDTH_UNITS; }
-    inline U64 region_handle() const { return grid_to_region_handle(x_regions, y_regions); }
-
-    // see: LLWorldMapMessage::processMapBlockReply
-    _MapBlock(LLMessageSystem* msg, S32 block)
-        : index(block)
-    {
-        msg->getU16Fast(_PREHASH_Data, _PREHASH_X, x_regions, block);
-        msg->getU16Fast(_PREHASH_Data, _PREHASH_Y, y_regions, block);
-        msg->getStringFast(_PREHASH_Data, _PREHASH_Name, name, block);
-        msg->getU8Fast(_PREHASH_Data, _PREHASH_Access, accesscode, block);
-        msg->getU32Fast(_PREHASH_Data, _PREHASH_RegionFlags, region_flags, block);
-        //        msg->getU8Fast(_PREHASH_Data, _PREHASH_WaterHeight, water_height, block);
-        //        msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block);
-        msg->getUUIDFast(_PREHASH_Data, _PREHASH_MapImageID, image_id, block);
-        // <FS:CR> Aurora Sim
-        if (msg->getNumberOfBlocksFast(_PREHASH_Size) > 0)
-        {
-            msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeX, x_size, block);
-            msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeY, y_size, block);
-        }
-        if (x_size == 0 || (x_size % 16) != 0 || (y_size % 16) != 0)
-        {
-            x_size = 256;
-            y_size = 256;
-        }
-        // </FS:CR> Aurora Sim
-    }
-};
-
-constexpr U32 EXACT_FLAG = 0x00000000;
-constexpr U32 LAYER_FLAG = 0x00000002;
-
-// see: LLWorldMapMessage::sendNamedRegionRequest
-static void _hypergrid_sendMapNameRequest(const std::string& region_name, U32 flags)
-{
-    LLMessageSystem* msg = gMessageSystem;
-    msg->newMessageFast(_PREHASH_MapNameRequest);
-    msg->nextBlockFast(_PREHASH_AgentData);
-    msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
-    msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
-    msg->addU32Fast(_PREHASH_Flags, flags);
-    msg->addU32Fast(_PREHASH_EstateID, 0); // Filled in on sim
-    msg->addBOOLFast(_PREHASH_Godlike, false); // Filled in on sim
-    msg->nextBlockFast(_PREHASH_NameData);
-    msg->addStringFast(_PREHASH_Name, region_name);
-    gAgent.sendReliableMessage();
-}
-
-struct _AdoptedRegionNameQuery
-{
-    std::string key{};
-    std::string region_name{};
-    url_callback_t arbitrary_callback;
-    std::string arbitrary_slurl{};
-    bool arbitrary_teleport{ false };
-};
-
-// map extracted region names => pending query entries
-static std::map<std::string, _AdoptedRegionNameQuery> _region_name_queries;
-
-bool hypergrid_sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport)
+bool hypergrid::sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport)
 {
     if (!LLGridManager::instance().isInOpenSim() || !callback)
     {
@@ -151,13 +154,13 @@ bool hypergrid_sendExactNamedRegionRequest(const std::string& region_name, const
     {
         return false;
     }
-    _region_name_queries[key] = { key, region_name, callback, callback_url, teleport };
+    region_name_queries.try_emplace(key, AdoptedRegionNameQuery{ key, region_name, callback, callback_url, teleport });
     htxhop_log("Send Region Name '%s' (key: %s)", region_name.c_str(), key.c_str());
-    _hypergrid_sendMapNameRequest(region_name, EXACT_FLAG);
+    sendMapNameRequest(region_name, EXACT_FLAG);
     return true;
 }
 
-bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags)
+bool hypergrid::processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags)
 {
     if (!LLGridManager::instance().isInOpenSim() || !msg || agent_flags & LAYER_FLAG)
     {
@@ -166,44 +169,44 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f
     // NOTE: we assume only agent_flags have been read from msg so far
     S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data);
 
-    std::vector<_MapBlock> blocks;
+    std::vector<MapBlock> blocks;
     blocks.reserve(num_blocks);
     for (S32 b = 0; b < num_blocks; b++)
     {
         blocks.emplace_back(msg, b);
     }
-    for (const auto& _block : blocks)
+    for (const auto& block : blocks)
     {
-        htxhop_log("#%02d key='%s' block.name='%s' block.region_handle=%llu", _block.index, extract_region(_block.name).c_str(), _block.name.c_str(), _block.region_handle());
+        htxhop_log("#%02d key='%s' block.name='%s' block.region_handle=%llu", block.index, extract_region(block.name).c_str(), block.name.c_str(), block.region_handle());
     }
     // special case: handle singular result w/empty name tho valid region handle AND singular pending query as a match
     // (might be that a landing area / redirect hop URL is coming back: "^hop://grid:port/$", which extract_region's into "")
     bool solo_result = blocks.size() == 2 && blocks[0].region_handle() && extract_region(blocks[0].name).empty() && !blocks[1].region_handle();
-    if (solo_result && _region_name_queries.size() == 1)
+    if (solo_result && region_name_queries.size() == 1)
     {
         htxhop_log("applying first block as redirect; region_handle: %llu", blocks[0].region_handle());
-        blocks[0].name = _region_name_queries.begin()->second.region_name;
+        blocks[0].name = region_name_queries.begin()->second.region_name;
     }
 
-    for (const auto& _block : blocks)
+    for (const auto& block : blocks)
     {
-        auto key = extract_region(_block.name);
+        auto key = extract_region(block.name);
         if (key.empty())
         {
             continue;
         }
 
-        auto idx = _region_name_queries.find(key);
-        if (idx == _region_name_queries.end())
+        auto idx = region_name_queries.find(key);
+        if (idx == region_name_queries.end())
         {
             continue;
         }
 
-        auto pending = idx->second;
+        auto pending{ idx->second };
         htxhop_log("Recv Region Name '%s' (key: %s) block.name='%s' block.region_handle=%llu)", pending.region_name.c_str(),
-            pending.key.c_str(), _block.name.c_str(), _block.region_handle());
-        _region_name_queries.erase(idx);
-        pending.arbitrary_callback(_block.region_handle(), pending.arbitrary_slurl, _block.image_id, pending.arbitrary_teleport);
+            pending.key.c_str(), block.name.c_str(), block.region_handle());
+        region_name_queries.erase(idx);
+        pending.arbitrary_callback(block.region_handle(), pending.arbitrary_slurl, block.image_id, pending.arbitrary_teleport);
         return true;
     }
     return false;
diff --git a/indra/newview/fsworldmapmessage.h b/indra/newview/fsworldmapmessage.h
index 2464ef15fd..3e4cca01e7 100644
--- a/indra/newview/fsworldmapmessage.h
+++ b/indra/newview/fsworldmapmessage.h
@@ -37,10 +37,13 @@
 class LLMessageSystem;
 class LLUUID;
 
-using url_callback_t = std::function<void(uint64_t region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>;
-
-bool hypergrid_sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport);
-bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags);
+namespace hypergrid
+{
+    // Needs to be identical to url_callback_t defined in llworldmapmessage.h
+    using url_callback_t = std::function<void(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>;
 
+    bool sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport);
+    bool processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags);
+}
 #endif
 #endif // FS_WORLDMAPMESSAGE_H
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index bbd0da9895..d521f5ded9 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -102,7 +102,7 @@ void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name,
 {
     // <FS:humbletim> FIRE-31368: [OPENSIM] ... Search returns more than one result
 #ifdef OPENSIM
-    if (hypergrid_sendExactNamedRegionRequest(region_name, callback, callback_url, teleport))
+    if (hypergrid::sendExactNamedRegionRequest(region_name, callback, callback_url, teleport))
     {
         return;
     }
@@ -171,7 +171,7 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
     msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
     // <FS:humbletim> FIRE-31368: [OPENSIM] ... Search returns more than one result
 #ifdef OPENSIM
-    if (hypergrid_processExactNamedRegionResponse(msg, agent_flags))
+    if (hypergrid::processExactNamedRegionResponse(msg, agent_flags))
     {
         return;
     }

From 8952e143bbd6ce9d68799e7c83c9d27e8673761a Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 1 Jun 2024 21:49:06 +0100
Subject: [PATCH 34/42] [OPENSIM] New grid builder for OpenSim

Integrate with login, Note: hop URLS nor supported by Dullahan
replace grids.xml with a minimal grids list.
Update settings and grids.xml for the new grid builder.
update legacy login page too
---
 indra/newview/app_settings/grids.xml          | 1086 +----------------
 indra/newview/app_settings/settings.xml       |   11 +
 indra/newview/fspanellogin.cpp                |    9 +
 indra/newview/fspanellogin.h                  |    1 +
 .../skins/default/xui/en/panel_fs_login.xml   |   34 +-
 .../default/xui/en/panel_fs_nui_login.xml     |   12 +
 6 files changed, 69 insertions(+), 1084 deletions(-)

diff --git a/indra/newview/app_settings/grids.xml b/indra/newview/app_settings/grids.xml
index 2a2e599f07..5c37cb0767 100644
--- a/indra/newview/app_settings/grids.xml
+++ b/indra/newview/app_settings/grids.xml
@@ -1,942 +1,32 @@
 <llsd>
     <map>
-    <key>alternatemetaverse.com:8002</key>
+        <key>localhost:9000</key>
         <map>
         <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
+            <date>2024-05-28T12:00:00Z</date>
+        <key>grid_login_id</key>
+            <string>localhost:9000</string>
         <key>gridname</key>
-            <string>Alternate Metaverse</string>
+            <string>localhost</string>
         <key>gridnick</key>
-            <string>AMV</string>
+            <string>localhost</string>
         <key>login_identifier_types</key>
             <array>
                 <string>agent</string>
                 <string>account</string>
             </array>
         <key>loginpage</key>
-            <string>https://alternatemetaverse.com/splash</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://alternatemetaverse.com:8002</string>
-            </array>
-        <key>name</key>
-            <string>alternatemetaverse.com:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>slurl_base</key>
-            <string>hop://alternatemetaverse.com:8002/</string>
-        </map>
-    <key>astralia.eu:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T11:43:19.89Z</date>
-        <key>gatekeeper</key>
-            <string>astralia.eu:8002</string>
-        <key>gridname</key>
-            <string>astralia</string>
-        <key>gridnick</key>
-            <string>astralia</string>
-        <key>helperuri</key>
-            <string>http://astralia.eu//currency/helper/landtool.php</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://astralia.eu</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://astralia.eu:8002/</string>
-            </array>
-        <key>name</key>
-            <string>astralia.eu:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>slurl_base</key>
-            <string>hop://astralia.eu:8002/</string>
-        </map>
-    <key>cc.opensimulator.org:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-09T10:00:00Z</date>
-        <key>gatekeeper</key>
-            <string>cc.opensimulator.org:8002</string>
-        <key>gridname</key>
-            <string>OpenSim Community Conference</string>
-        <key>gridnick</key>
-            <string>opensimcc</string>
-        <key>helperuri</key>
-            <string>http://cc.opensimulator.org/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://cc.opensimulator.org:8005/wifi/welcome.html</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://cc.opensimulator.org:8002/</string>
-            </array>
-        <key>name</key>
-            <string>cc.opensimulator.org:8002</string>
-        <key>password</key>
-            <string>http://cc.opensimulator.org:8005/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://cc.opensimulator.org:8005/wifi/user/account</string>
-        <key>slurl_base</key>
-            <string>hop://cc.opensimulator.org:8002/</string>
-        </map>
-    <key>craft-world.org:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T14:23:31.86Z</date>
-        <key>about</key>
-            <string>https://www.craft-world.org/</string>
-        <key>gatekeeper</key>
-            <string>craft-world.org:8002</string>
-        <key>gridname</key>
-            <string>Craft World</string>
-        <key>gridnick</key>
-            <string>craft</string>
-        <key>help</key>
-            <string>https://www.craft-world.org/page/en/support.php</string>
-        <key>helperuri</key>
-            <string>http://webapp.craft-world.org/economy/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://www.craft-world.org/loginscreen.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://craft-world.org:8002/</string>
-            </array>
-        <key>name</key>
-            <string>craft-world.org:8002</string>
-        <key>password</key>
-            <string>https://www.craft-world.org/page/en/avatar-tools.php</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://www.craft-world.org/page/en/register-an-avatar.php</string>
-        <key>slurl_base</key>
-            <string>hop://craft-world.org:8002/</string>
-        </map>
-    <key>discoverygrid.net:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-04-24T12:06:59.18Z</date>
-        <key>about</key>
-            <string>https://discoverygrid.net/about.php</string>
-        <key>gatekeeper</key>
-            <string>discoverygrid.net:8002</string>
-        <key>gridname</key>
-            <string>DiscoveryGrid</string>
-        <key>gridnick</key>
-            <string>DiscoveryGrid</string>
-        <key>help</key>
-            <string>https://discoverygrid.net</string>
-        <key>helperuri</key>
-            <string>https://discoverygrid.net/apps/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://discoverygrid.net/viewersplash.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://discoverygrid.net:8002/</string>
-            </array>
-        <key>name</key>
-            <string>discoverygrid.net:8002</string>
-        <key>password</key>
-            <string>https://discoverygrid.net/#needpw</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://discoverygrid.net/index.php#create</string>
-        <key>slurl_base</key>
-            <string>hop://discoverygrid.net:8002/</string>
-        </map>
-    <key>fireandicegrid.net:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:59.83Z</date>
-        <key>about</key>
-            <string>http://fireandicegrid.net</string>
-        <key>gatekeeper</key>
-            <string>fireandicegrid.net:8002</string>
-        <key>gridname</key>
-            <string>Fire And Ice Grid</string>
-        <key>gridnick</key>
-            <string>FireAndIceGrid</string>
-        <key>help</key>
-            <string>http://fireandicegrid.net</string>
-        <key>helperuri</key>
-            <string>http://fireandicegrid.net</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://fireandicegrid.net</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://fireandicegrid.net:8002/</string>
-            </array>
-        <key>name</key>
-            <string>fireandicegrid.net:8002</string>
-        <key>password</key>
-            <string>http://fireandicegrid.net:8002/wifi</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://fireandicegrid.net:8002/wifi</string>
-        <key>slurl_base</key>
-            <string>hop://fireandicegrid.net:8002/</string>
-        </map>
-    <key>gaynations.org:7002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>gaynations.org:7002</string>
-        </map>
-    <key>goto.theencoreescape.com:8002</key>
-        <map>
-        <key>DirectoryFee</key>
-            <string>0</string>
-        <key>LastModified</key>
-            <date>2020-04-24T17:00:50.92Z</date>
-        <key>SendGridInfoToViewerOnLogin</key>
-            <string>true</string>
-        <key>about</key>
-            <string>http://theencoreescape.com/</string>
-        <key>gatekeeper</key>
-            <string>goto.theencoreescape.com:8002</string>
-        <key>gridname</key>
-            <string>The Encore Escape</string>
-        <key>gridnick</key>
-            <string>EncoreEscape</string>
-        <key>help</key>
-            <string>http://theencoreescape.com/</string>
-        <key>helperuri</key>
-            <string>http://money.theencoreescape.com/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://splash.theencoreescape.com/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://goto.theencoreescape.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>goto.theencoreescape.com:8002</string>
-        <key>password</key>
-            <string>http://theencoreescape.com/</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://theencoreescape.com/</string>
-        <key>search</key>
-            <string>http://search.theencoreescape.com/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://goto.theencoreescape.com:8002/</string>
-        </map>
-    <key>grid.3rdrockgrid.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2012-08-03T15:32:54.31Z</date>
-        <key>about</key>
-            <string>http://3rdrockgrid.com/</string>
-        <key>gridname</key>
-            <string>3RD Rock Grid</string>
-        <key>gridnick</key>
-            <string>3RG</string>
-        <key>help</key>
-            <string>http://3rdrockgrid.com/</string>
-        <key>helperuri</key>
-            <string>http://grid.3rdrockgrid.com/3rg_money/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://grid.3rdrockgrid.com/3rg_login/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://grid.3rdrockgrid.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>grid.3rdrockgrid.com:8002</string>
-        <key>password</key>
-            <string>http://3rdrockgrid.com/</string>
-        <key>register</key>
-            <string>http://3rdrockgrid.com/</string>
-        <key>slurl_base</key>
-            <string>hop://grid.3rdrockgrid.com:8002/</string>
-        </map>
-
-    <key>grid.avacon.org:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T12:01:35.02Z</date>
-        <key>gatekeeper</key>
-            <string>grid.avacon.org:8002</string>
-        <key>gridname</key>
-            <string>AvaCon Grid</string>
-        <key>gridnick</key>
-            <string>avacon</string>
-        <key>helperuri</key>
-            <string>http://grid.avacon.org/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://grid.avacon.org:8005/wifi/welcome.html</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://grid.avacon.org:8002/</string>
-            </array>
-        <key>name</key>
-            <string>grid.avacon.org:8002</string>
-        <key>password</key>
-            <string>http://grid.avacon.org:8005/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://grid.avacon.org:8005/wifi/user/account</string>
-        <key>slurl_base</key>
-            <string>hop://grid.avacon.org:8002/</string>
-        </map>
-    <key>grid.kitely.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2014-03-20T12:30:00Z</date>
-        <key>gatekeeper</key>
-            <string>grid.kitely.com:8002</string>
-        <key>gridname</key>
-            <string>Kitely</string>
-        <key>gridnick</key>
-            <string>kitely</string>
-        <key>helperuri</key>
-            <string>http://grid.kitely.com:8002/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.kitely.com/viewer_login</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://grid.kitely.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>grid.kitely.com:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>slurl_base</key>
-            <string>hop://grid.kitely.com:8002/</string>
-        </map>
-    <key>grid.virtualife.cloud:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:50:32.55Z</date>
-        <key>about</key>
-            <string>http://www.virtualife.cloud</string>
-        <key>gatekeeper</key>
-            <string>grid.virtualife.cloud:8002</string>
-        <key>gridname</key>
-            <string>virtualife world</string>
-        <key>gridnick</key>
-            <string>Virtualife world</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.virtualife.cloud/index.php?option=com_opensim</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://grid.virtualife.cloud:8002/</string>
-            </array>
-        <key>name</key>
-            <string>grid.virtualife.cloud:8002</string>
-        <key>password</key>
-            <string>http://grid.virtualife.cloud:8002/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://grid.virtualife.cloud:8002/wifi/user/account</string>
-        <key>slurl_base</key>
-            <string>hop://grid.virtualife.cloud:8002/</string>
-        </map>
-    <key>grid01.from-ne.com:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>name</key>
-            <string>grid01.from-ne.com:8002</string>
-        </map>
-    <key>hypergrid.org:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2013-04-02T01:01:24.65Z</date>
-        <key>about</key>
-            <string>http://www.hypergrid.org/metropolis/wiki</string>
-        <key>gatekeeper</key>
-            <string>hypergrid.org:8002</string>
-        <key>gridname</key>
-            <string>Metropolis Metaversum</string>
-        <key>gridnick</key>
-            <string>Metropolis</string>
-        <key>help</key>
-            <string>http://metropolis.hypergrid.org/forum</string>
-        <key>helperuri</key>
-            <string>http://metropolis.hypergrid.org/currency/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://metropolis.hypergrid.org</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://hypergrid.org:8002/</string>
-            </array>
-        <key>name</key>
-            <string>hypergrid.org:8002</string>
-        <key>password</key>
-            <string>http://metropolis.hypergrid.org/password.php</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://www.hypergrid.org/metropolis/metro_rg.php</string>
-        <key>slurl_base</key>
-            <string>hop://hypergrid.org:8002/</string>
-        </map>
-    <key>islandoasisgrid.biz:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2013-01-21T20:10:35.17Z</date>
-        <key>about</key>
-            <string>http://www.islandoasis.biz/GridStats.aspx</string>
-        <key>gridname</key>
-            <string>Island Oasis</string>
-        <key>gridnick</key>
-            <string>Island_Oasis</string>
-        <key>help</key>
-            <string>http://www.islandoasis.biz/Support.aspx</string>
-        <key>helperuri</key>
-            <string>http://islandoasisgrid:8020/OsCurrency/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.islandoasis.biz/welcome.aspx</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://islandoasisgrid.biz:8002/</string>
-            </array>
-        <key>name</key>
-            <string>islandoasisgrid.biz:8002</string>
-        <key>password</key>
-            <string>http://www.islandoasis.biz/Login.aspx</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://www.islandoasis.biz/verification.aspx</string>
-        <key>slurl_base</key>
-            <string>hop://islandoasisgrid.biz:8002/</string>
-        </map>
-    <key>lfgrid.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2013-03-18T21:51:17.62Z</date>
-        <key>about</key>
-            <string>http://lfgrid.com/about/</string>
-        <key>gatekeeper</key>
-            <string>lfgrid.com:8002</string>
-        <key>gridname</key>
-            <string>Littlefield Grid</string>
-        <key>gridnick</key>
-            <string>LFgrid</string>
-        <key>help</key>
-            <string>http://lfgrid.com/help</string>
-        <key>helperuri</key>
-            <string>http://lfgrid.com/services/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.lfgrid.com/splash/index.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://lfgrid.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>lfgrid.com:8002</string>
-        <key>password</key>
-            <string>http://lfgrid.com:8002/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://lfgrid.com:8002/wifi/user/account/</string>
-        <key>slurl_base</key>
-            <string>hop://lfgrid.com:8002/</string>
-        </map>
-    <key>login.aviworlds.com:8002</key>
-        <map>
-        <key>DirectoryFee</key>
-            <string>0</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:55.32Z</date>
-        <key>SendGridInfoToViewerOnLogin</key>
-            <string>true</string>
-        <key>about</key>
-            <string>http://aviworlds.com</string>
-        <key>gatekeeper</key>
-            <string>login.aviworlds.com:8002</string>
-        <key>gridname</key>
-            <string>AviWorlds</string>
-        <key>gridnick</key>
-            <string>Avi</string>
-        <key>help</key>
-            <string>http://aviworlds.com</string>
-        <key>helperuri</key>
-            <string>http://login.aviworlds.com/helper_scripts/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://login.aviworlds.com/splash</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.aviworlds.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>login.aviworlds.com:8002</string>
-        <key>password</key>
-            <string>http://login.aviworlds.com:8002/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://login.aviworlds.com:8002/wifi/user/account/</string>
-        <key>search</key>
-            <string>http://login.aviworlds.com/ossearch/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://login.aviworlds.com:8002/</string>
-        </map>
-    <key>login.digiworldz.com:8002</key>
-        <map>
-        <key>DirectoryFee</key>
-            <string>0</string>
-        <key>LastModified</key>
-            <date>2015-07-24T13:19:44.27Z</date>
-        <key>SendGridInfoToViewerOnLogin</key>
-            <string>true</string>
-        <key>about</key>
-            <string>http://digiworldz.com/</string>
-        <key>gatekeeper</key>
-            <string>login.digiworldz.com:8002</string>
-        <key>gridname</key>
-            <string>DigiWorldZ Grid</string>
-        <key>gridnick</key>
-            <string>DWG</string>
-        <key>help</key>
-            <string>http://digiworldz.com/</string>
-        <key>helperuri</key>
-            <string>http://money.digiworldz.com/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://splash.digiworldz.com/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.digiworldz.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>login.digiworldz.com:8002</string>
-        <key>password</key>
-            <string>http://digiworldz.com/</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://digiworldz.com/</string>
-        <key>search</key>
-            <string>http://search.digiworldz.com/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://login.digiworldz.com:8002/</string>
-        </map>
-    <key>login.francogrid.org:80</key>
-        <map>
-        <key>LastModified</key>
-            <date>2013-02-14T02:00:46.10Z</date>
-        <key>about</key>
-            <string>http://francogrid.org/</string>
-        <key>gridname</key>
-            <string>FrancoGrid</string>
-        <key>gridnick</key>
-            <string>francogrid</string>
-        <key>help</key>
-            <string>http://francogrid.org/aide</string>
-        <key>helperuri</key>
-            <string>http://helper.main.francogrid.org/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://viewer.francogrid.org/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.francogrid.org/</string>
-            </array>
-        <key>name</key>
-            <string>login.francogrid.org:80</string>
-        <key>password</key>
-            <string>http://francogrid.org/user/password</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://francogrid.org/user/register</string>
-        <key>slurl_base</key>
-            <string>hop://login.francogrid.org:80/</string>
-        </map>
-    <key>login.greatcanadiangrid.ca:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>login.greatcanadiangrid.ca:8002</string>
-        </map>
-    <key>login.osgrid.org</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-04-19T21:15:00Z</date>
-        <key>about</key>
-            <string>http://www.osgrid.org/</string>
-        <key>gatekeeper</key>
-            <string>hg.osgrid.org:80</string>
-        <key>gridname</key>
-            <string>OSGrid</string>
-        <key>gridnick</key>
-            <string>osgrid</string>
-        <key>help</key>
-            <string>http://www.osgrid.org/</string>
-        <key>helperuri</key>
-            <string>http://helper.osgrid.org/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.osgrid.org/splash/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.osgrid.org/</string>
-            </array>
-        <key>name</key>
-            <string>login.osgrid.org</string>
-        <key>password</key>
-            <string>http://www.osgrid.org/</string>
-        <key>platform</key>
             <undef />
-        <key>register</key>
-            <string>http://www.osgrid.org/</string>
-        <key>slurl_base</key>
-            <string>hop://login.osgrid.org/</string>
-        <key>web_profile_url</key>
-            <string>http://my.osgrid.org/?name=[AGENT_NAME]</string>
-        </map>
-    <key>login.ufsgrid.com:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>name</key>
-            <string>login.ufsgrid.com:8002</string>
-        </map>
-    <key>login.zetaworlds.com</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T12:39:31.19Z</date>
-        <key>about</key>
-            <string>https://zetaworlds.com/</string>
-        <key>gridname</key>
-            <string>ZetaWorlds</string>
-        <key>gridnick</key>
-            <string>ZetaWorlds</string>
-        <key>helperuri</key>
-            <string>http://money.zetaworlds.com/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://zetaworlds.com/splash</string>
         <key>loginuri</key>
             <array>
-                <string>https://login.zetaworlds.com/</string>
+                <string>http://localhost:9000</string>
             </array>
         <key>name</key>
-            <string>login.zetaworlds.com</string>
-        <key>password</key>
-            <string>https://zetaworlds.com/user/forgot</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://zetaworlds.com/user/register</string>
+            <string>localhost:9000</string>
         <key>slurl_base</key>
-            <string>hop://login.zetaworlds.com/</string>
-        </map>
-    <key>login.zonenations.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:43:24.96Z</date>
-        <key>about</key>
-            <string>https://www.zonenations.com/</string>
-        <key>gatekeeper</key>
-            <string>login.zonenations.com:8002</string>
-        <key>gridname</key>
-            <string>Zone Nations</string>
-        <key>gridnick</key>
-            <string>ZoneNations</string>
-        <key>help</key>
-            <string>https://www.zonenations.com/supporto.html</string>
-        <key>helperuri</key>
-            <string>https://www.zonenations.com/components/com_opensim/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://www.zonenations.com/index.php?option=com_opensim</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.zonenations.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>login.zonenations.com:8002</string>
-        <key>password</key>
-            <string>https://www.zonenations.com/password-smarrita.html</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://www.zonenations.com/iscriviti.html</string>
-        <key>slurl_base</key>
-            <string>hop://login.zonenations.com:8002/</string>
-        </map>
-    <key>login.main.mobiusgrid.us:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>name</key>
-            <string>login.main.mobiusgrid.us:8002</string>
-        </map>
-    <key>main.mobiusgrid.us</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T13:19:55.40Z</date>
-        <key>about</key>
-            <string>https://mobiusgrid.us/about</string>
-        <key>gridname</key>
-            <string>Mobius Grid</string>
-        <key>gridnick</key>
-            <string>Mobius</string>
-        <key>help</key>
-            <string>https://mobiusgrid.us/help</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://mobiusgrid.us/splash</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.main.mobiusgrid.us</string>
-            </array>
-        <key>name</key>
-            <string>main.mobiusgrid.us</string>
-        <key>password</key>
-            <string>https://mobiusgrid.us/forgot</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://mobiusgrid.us/join</string>
-        <key>slurl_base</key>
-            <string>hop://main.mobiusgrid.us/</string>
-        </map>
-    <key>partydestinationgrid.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:48:17.58Z</date>
-        <key>about</key>
-            <string>https://partydestinationgrid.com/</string>
-        <key>gatekeeper</key>
-            <string>partydestinationgrid.com:8002</string>
-        <key>gridname</key>
-            <string>Party Destination Grid</string>
-        <key>gridnick</key>
-            <string>partydestinationgrid</string>
-        <key>help</key>
-            <string>https://partydestinationgrid.com/index.php/help/help</string>
-        <key>helperuri</key>
-            <string>http://partydestinationgrid.com/components/com_opensim/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://module.partydestinationgrid.com/login</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://partydestinationgrid.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>partydestinationgrid.com:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://partydestinationgrid.com/index.php/component/users/?view=registration</string>
-        <key>slurl_base</key>
-            <string>hop://partydestinationgrid.com:8002/</string>
-        </map>
-    <key>tanglegrid.net:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:49:43.20Z</date>
-        <key>about</key>
-            <string>http://tanglegrid.com/</string>
-        <key>gatekeeper</key>
-            <string>tanglegrid.net:8002</string>
-        <key>gridname</key>
-            <string>TanGLe Grid</string>
-        <key>gridnick</key>
-            <string>TanGLe</string>
-        <key>help</key>
-            <string>http://tanglegrid.com/contact.php</string>
-        <key>helperuri</key>
-            <string>http://tanglegrid.net/scripts/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://tanglegrid.net/web_interface/loginscreen.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://tanglegrid.net:8002/</string>
-            </array>
-        <key>name</key>
-            <string>tanglegrid.net:8002</string>
-        <key>password</key>
-            <string>http://www.tanglegrid.net/web_interface/index.php?page=forgotpass</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://www.tanglegrid.net/web_interface/avatar.php</string>
-        <key>search</key>
-            <string>http://www.tanglegrid.net/helper/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://tanglegrid.net:8002/</string>
-        </map>
-    <key>thekazgrid.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:47:15.79Z</date>
-        <key>about</key>
-            <string>https://www.thekazgrid.com/index.php/11-about/6-about</string>
-        <key>gridname</key>
-            <string>TheKaz Grid</string>
-        <key>gridnick</key>
-            <string>TheKaz</string>
-        <key>helperuri</key>
-            <string>https://www.thekazgrid.com/currency/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://www.thekazgrid.com/index.php?option=com_opensim</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://thekazgrid.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>thekazgrid.com:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://www.thekazgrid.com/index.php/join</string>
-        <key>slurl_base</key>
-            <string>hop://thekazgrid.com:8002/</string>
-        </map>
-    <key>util.aditi.lindenlab.com</key>
+            <string>hop://localhost:9000/</string>
+        </map>        
+        <key>util.aditi.lindenlab.com</key>
         <map>
         <key>LastModified</key>
             <date>2018-09-26T20:15:00Z</date>
@@ -953,7 +43,7 @@
                 <string>agent</string>
             </array>
         <key>loginpage</key>
-            <string>https://phoenixviewer.com/app/loginV3/</string>
+            <string>http://phoenixviewer.com/app/loginV3/</string>
         <key>loginuri</key>
             <array>
                 <string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
@@ -986,7 +76,7 @@
             <string>agent</string>
         </array>
         <key>loginpage</key>
-        <string>https://phoenixviewer.com/app/loginV3/</string>
+        <string>http://phoenixviewer.com/app/loginV3/</string>
         <key>loginuri</key>
         <array>
             <string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
@@ -999,156 +89,6 @@
         <integer>1</integer>
         <key>web_profile_url</key>
         <string>https://my.secondlife.com/</string>
-    </map>
-    <key>grid.alifevirtual.com:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-04-04T10:42:24.54Z</date>
-        <key>name</key>
-            <string>grid.alifevirtual.com:8002</string>
-        </map>
-    <key>www.alifevirtual.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-05-30T09:41:01.73Z</date>
-        <key>about</key>
-            <string>http://www.alifevirtual.com/</string>
-        <key>gridname</key>
-            <string>Alife Virtual</string>
-        <key>gridnick</key>
-            <string>AV</string>
-        <key>help</key>
-            <string>http://www.alifevirtual.com/</string>
-        <key>helperuri</key>
-            <string>http://www.alifevirtual.com/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.alifevirtual.com/welcome.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://www.alifevirtual.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>www.alifevirtual.com:8002</string>
-        <key>password</key>
-            <string>http://www.alifevirtual.com/</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://www.alifevirtual.com/</string>
-        <key>slurl_base</key>
-            <string>hop://www.alifevirtual.com:8002/</string>
-        </map>
-    <key>grid.avatarconnection.com:8002/</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>grid.avatarconnection.com:8002/</string>
-        </map>
-    <key>grid.roleplayworlds.net:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>grid.roleplayworlds.net:8002</string>
-        </map>
-    <key>inworldz.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2018-08-23T21:00:00.00Z</date>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>name</key>
-            <string>inworldz.com:8002</string>
-        </map>
-    <key>login.avination.com/</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>name</key>
-            <string>login.avination.com/</string>
-        <key>LastModified</key>
-            <date>2018-02-28T15:36:26.43Z</date>
-        </map>
-    <key>login.danger.osgrid.org</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>login.danger.osgrid.org</string>
-        </map>
-    <key>reactiongrid.com:8008</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>reactiongrid.com:8008</string>
-        </map>
-    <key>login.aurorascape.com:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>login.aurorascape.com:8002</string>
-        </map>
-    <key>vidadupla.com.br:8002</key>
-        <map>
-        <key>DirectoryFee</key>
-            <string>0</string>
-        <key>LastModified</key>
-            <date>2020-11-06T14:42:01.07Z</date>
-        <key>SendGridInfoToViewerOnLogin</key>
-            <string>true</string>
-        <key>about</key>
-            <string>http://vidadupla.com.br</string>
-        <key>gatekeeper</key>
-            <string>vidadupla.com.br:8002</string>
-        <key>gridname</key>
-            <string>Vida Dupla</string>
-        <key>gridnick</key>
-            <string>VD</string>
-        <key>helperuri</key>
-            <string>http://vidadupla.com.br/helper_scripts/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://vidadupla.com.br/splash</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://vidadupla.com.br:8002/</string>
-            </array>
-        <key>name</key>
-            <string>vidadupla.com.br:8002</string>
-        <key>password</key>
-            <string>http://vidadupla.com.br:8002/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://vidadupla.com.br:8002/wifi/user/account/</string>
-        <key>search</key>
-            <string>http://vidadupla.com.br/ossearch/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://vidadupla.com.br:8002/</string>
         </map>
     </map>
 </llsd>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 31aed2fcb1..fcb8f9febb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -153,6 +153,17 @@
     <key>Value</key>
     <string>http://phoenixviewer.com/app/fsdata/grids.xml</string>
   </map>
+  <key>FSGridBuilderURL</key>
+  <map>
+    <key>Comment</key>
+    <string>Fetch an html page of grids from this URL.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>https://phoenixviewer.com/app/fsdata/fs_grid_builder.html</string>
+  </map>
   <key>LastConnectedGrid</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp
index 1e5e8c5019..222b5dbd4e 100644
--- a/indra/newview/fspanellogin.cpp
+++ b/indra/newview/fspanellogin.cpp
@@ -250,6 +250,9 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
     LLTextBox* grid_mgr_help_text = getChild<LLTextBox>("grid_login_text");
     grid_mgr_help_text->setClickedCallback(onClickGridMgrHelp, NULL);
 
+    LLTextBox* grid_builder_text = getChild<LLTextBox>("grid_builder_text");
+    grid_builder_text->setClickedCallback(onClickGridBuilder, NULL);
+
     LLSLURL start_slurl(LLStartUp::getStartSLURL());
     // The StartSLURL might have been set either by an explicit command-line
     // argument (CmdLineLoginLocation) or by default.
@@ -1356,6 +1359,12 @@ void FSPanelLogin::onClickGridMgrHelp(void*)
     }
 }
 
+//static
+void FSPanelLogin::onClickGridBuilder(void*)
+{
+    LLWeb::loadURLInternal(gSavedSettings.getString("FSGridBuilderURL"));
+}
+
 void FSPanelLogin::onSelectUser()
 {
     LL_INFOS("AppInit") << "onSelectUser()" << LL_ENDL;
diff --git a/indra/newview/fspanellogin.h b/indra/newview/fspanellogin.h
index be348ac25c..5963972abd 100644
--- a/indra/newview/fspanellogin.h
+++ b/indra/newview/fspanellogin.h
@@ -111,6 +111,7 @@ private:
     static void onClickRemove(void*);
     static void onRemoveCallback(const LLSD& notification, const LLSD& response);
     static void onClickGridMgrHelp(void*);
+    static void onClickGridBuilder(void*);
     static std::string credentialName();
 
 private:
diff --git a/indra/newview/skins/default/xui/en/panel_fs_login.xml b/indra/newview/skins/default/xui/en/panel_fs_login.xml
index 05fdee217b..c720ca40ed 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml
@@ -158,17 +158,17 @@
           top_pad="0"
           name="start_location_combo"
           width="165">
-        <combo_box.item
-            label="Last location"
-            name="MyLastLocation"
-            value="last" />
-        <combo_box.item
-            label="Home"
-            name="MyHome"
-            value="home" />
-        <combo_box.item
-            label="&lt;Type region name&gt;"
-            name="Typeregionname" value="" />
+          <combo_box.item
+          label="Last location"
+          name="MyLastLocation"
+          value="last" />
+          <combo_box.item
+          label="Home"
+          name="MyHome"
+          value="home" />
+          <combo_box.item
+          label="&lt;Type region name&gt;"
+          name="Typeregionname" value="" />
       </combo_box>
     </layout_panel>
     <layout_panel
@@ -179,6 +179,17 @@
         width="145"
         height="80"
         visible="false">
+      <text
+        follows="left|top|right"
+        font="SansSerifMedium"
+        text_color="EmphasisColor"
+        top="10"
+        height="16"
+        name="grid_builder_text"
+        left="5"
+        width="190">
+      + Click to add more grids
+      </text>
       <text
         follows="left|bottom"
         font="SansSerifSmall"
@@ -193,6 +204,7 @@
         allow_text_entry="true"
         follows="left|bottom"
         height="22"
+        top_pad="0"
         max_chars="256"
         force_disable_fulltext_search="true"
         combo_editor.commit_on_focus_lost="false"
diff --git a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
index b03589554a..65745ad788 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
@@ -282,6 +282,18 @@
     <combo_box.drop_down_button
       font="SansSerifLarge"/>
     </combo_box>
+    <text
+      follows="left|top|right"
+      font="SansSerifMedium"
+      text_color="EmphasisColor"
+      top_pad="5"
+      height="16"
+      name="grid_builder_text"
+      valign="center"
+      left="45"
+      width="190">
+    + Click to add more grids
+    </text>
     </layout_panel>
     <layout_panel
       follows="left|top|right"

From ecf297e6a13d1c0df2fb5578a338a67dfa97ad14 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 1 Jun 2024 21:57:20 +0100
Subject: [PATCH 35/42] unb0rk the indents that broke somehow.

---
 .../skins/default/xui/en/panel_fs_login.xml   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_fs_login.xml b/indra/newview/skins/default/xui/en/panel_fs_login.xml
index c720ca40ed..52500edb4f 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml
@@ -150,23 +150,23 @@
         Start at:
       </text>
       <combo_box
-          allow_text_entry="true"
-          control_name="NextLoginLocation"
-          follows="left|bottom"
-          height="22"
-          max_chars="128"
-          top_pad="0"
-          name="start_location_combo"
-          width="165">
-          <combo_box.item
+        allow_text_entry="true"
+        control_name="NextLoginLocation"
+        follows="left|bottom"
+        height="22"
+        max_chars="128"
+        top_pad="0"
+        name="start_location_combo"
+        width="165">
+        <combo_box.item
           label="Last location"
           name="MyLastLocation"
           value="last" />
-          <combo_box.item
+        <combo_box.item
           label="Home"
           name="MyHome"
           value="home" />
-          <combo_box.item
+        <combo_box.item
           label="&lt;Type region name&gt;"
           name="Typeregionname" value="" />
       </combo_box>

From 14cc5f026bbb87d654f2ee5d07694cd672154637 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 2 Jun 2024 02:37:56 +0200
Subject: [PATCH 36/42] Update German translation

---
 indra/newview/skins/default/xui/de/panel_fs_login.xml     | 3 +++
 indra/newview/skins/default/xui/de/panel_fs_nui_login.xml | 3 +++
 indra/newview/skins/default/xui/en/panel_fs_nui_login.xml | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/de/panel_fs_login.xml b/indra/newview/skins/default/xui/de/panel_fs_login.xml
index 42d8bdbeee..3f5cb17650 100644
--- a/indra/newview/skins/default/xui/de/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_fs_login.xml
@@ -34,6 +34,9 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel name="grid_panel">
+			<text name="grid_builder_text">
+				+ Klicken um Grids hinzuzufügen
+			</text>
 			<text name="grid_login_text">
 				Gridauswahl:
 			</text>
diff --git a/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml
index 3c8688ec84..b5e3865d9d 100644
--- a/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml
@@ -37,6 +37,9 @@
 							<text name="grid_login_text">
 								Grid:
 							</text>
+							<text name="grid_builder_text">
+								+ Klicken um Grids hinzuzufügen
+							</text>
 						</layout_panel>
 						<layout_panel name="mode_selection">
 							<text name="mode_selection_text">
diff --git a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
index 65745ad788..a709af3ecb 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
@@ -291,7 +291,7 @@
       name="grid_builder_text"
       valign="center"
       left="45"
-      width="190">
+      width="250">
     + Click to add more grids
     </text>
     </layout_panel>

From 3316049ba7dba88d17db8cd33fd1f6947ead9543 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 2 Jun 2024 16:01:13 +0200
Subject: [PATCH 37/42] FIRE-33849: Fix Favorite Wearables list not updating
 properly when filtering

---
 indra/newview/fsfloaterwearablefavorites.cpp | 1 +
 indra/newview/fsfloaterwearablefavorites.h   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/indra/newview/fsfloaterwearablefavorites.cpp b/indra/newview/fsfloaterwearablefavorites.cpp
index e0d7c3984a..0e3a79e748 100644
--- a/indra/newview/fsfloaterwearablefavorites.cpp
+++ b/indra/newview/fsfloaterwearablefavorites.cpp
@@ -313,6 +313,7 @@ void FSFloaterWearableFavorites::onFilterEdit(const std::string& search_string)
 {
     mItemsList->setFilterSubString(search_string, true);
     mItemsList->setNoItemsCommentText(getString("empty_list"));
+    mItemsList->rearrange();
 }
 
 void FSFloaterWearableFavorites::onOptionsMenuItemClicked(const LLSD& userdata)
diff --git a/indra/newview/fsfloaterwearablefavorites.h b/indra/newview/fsfloaterwearablefavorites.h
index ee13a7e9f5..21431c7635 100644
--- a/indra/newview/fsfloaterwearablefavorites.h
+++ b/indra/newview/fsfloaterwearablefavorites.h
@@ -61,6 +61,11 @@ public:
         return mDADSignal.connect(cb);
     }
 
+    void rearrange()
+    {
+        rearrangeItems();
+    }
+
 protected:
     friend class LLUICtrlFactory;
     FSWearableFavoritesItemsList(const Params&);

From 05be30749d9b7786901130ea8e342002b7b003a9 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 2 Jun 2024 18:06:12 +0200
Subject: [PATCH 38/42] FIRE-33972, FIRE-33974: Updated French (by Laurent
 Bechir), Russian (by Romka Swallowtail) and Polish translations - login panel

---
 indra/newview/skins/default/xui/fr/floater_whitelist.xml  | 8 ++++----
 indra/newview/skins/default/xui/fr/panel_fs_login.xml     | 3 +++
 indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml | 3 +++
 indra/newview/skins/default/xui/pl/panel_fs_login.xml     | 3 +++
 indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml | 3 +++
 indra/newview/skins/default/xui/ru/panel_fs_login.xml     | 3 +++
 indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml | 1 +
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist.xml b/indra/newview/skins/default/xui/fr/floater_whitelist.xml
index 6d83b0c19f..43c7cbe09f 100644
--- a/indra/newview/skins/default/xui/fr/floater_whitelist.xml
+++ b/indra/newview/skins/default/xui/fr/floater_whitelist.xml
@@ -1,17 +1,17 @@
-<floater name="whitelist_floater" title="Whitelist Folders and Binaries">
+<floater name="whitelist_floater" title="Liste blanche de dossiers et programmes">
 	<text name="whitelist_intro">
 Les antivirus et les anti-logiciels malveillants sont un élément essentiel d'une utilisation sûre de l'internet, mais ils peuvent causer toute une série de problèmes à la visionneuse.
-Pour réduire les interférences et améliorer la stabilité et les performances, nous conseillons vivement à tous les utilisateurs de veiller à ce qu'il y ait des exclusions (connues sous le nom de liste blanche) pour les dossiers et les programmes importants que la visionneuse utilise.
+Pour réduire les interférences et améliorer la stabilité et les performances, nous conseillons vivement à tous les utilisateurs de veiller à ce qu'il y ait des exclusions (connues sous le nom de liste blanche) pour les dossiers et les programmes importants que la visionneuse utilise. 
 
 Pour plus d'informations, visitez le site
 https://wiki.firestormviewer.org/antivirus_whitelisting
 	</text>
 	<text name="whitelist_folder_instruction">
-Pour vous simplifier la tâche, l'encadré ci-dessous indique les dossiers utilisés par la visionneuse.
+Pour vous simplifier la tâche, l'encadré ci-dessous indique les dossiers utilisés par la visionneuse. 
 Veuillez les ajouter à vos exclusions de dossiers AV, comme indiqué sur la page wiki ci-dessus.
 	</text>
 	<text name="whitelist_exe_instruction">
-La case suivante indique le nom et le chemin d'accès complet des exécutables de la visionneuse.
+La case suivante indique le nom et le chemin d'accès complet des exécutables de la visionneuse. 
 Ajoutez-les à vos exclusions d'exécutables AV comme indiqué dans le wiki ci-dessus.
 	</text>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/panel_fs_login.xml b/indra/newview/skins/default/xui/fr/panel_fs_login.xml
index 73f9e42d81..f3e1c749ac 100644
--- a/indra/newview/skins/default/xui/fr/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_fs_login.xml
@@ -17,6 +17,9 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel name="grid_panel">
+			<text name="grid_builder_text">
+				+ Ajouter des grilles
+			</text>
 			<text name="grid_login_text">Connexion à la Grille :</text>
 		</layout_panel>
 		<layout_panel name="links_login_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml
index fb0ad900ce..f0d8968d49 100644
--- a/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml
@@ -37,6 +37,9 @@
 							<text name="grid_login_text" width="55">
 								Grille :
 							</text>
+							<text name="grid_builder_text">
+								+ Ajouter des grilles
+							</text>
 						</layout_panel>
 						<layout_panel name="mode_selection">
 							<text name="mode_selection_text">
diff --git a/indra/newview/skins/default/xui/pl/panel_fs_login.xml b/indra/newview/skins/default/xui/pl/panel_fs_login.xml
index ad4302a343..dbb2a84c4f 100644
--- a/indra/newview/skins/default/xui/pl/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_fs_login.xml
@@ -28,6 +28,9 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel name="grid_panel">
+			<text name="grid_builder_text">
+				+ Kliknij, by dodać światy
+			</text>
 			<text name="grid_login_text">
 				Loguj do świata:
 			</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml
index ba215d8ec0..08af7c43a2 100644
--- a/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml
@@ -34,6 +34,9 @@
 							<text name="grid_login_text" width="55">
 								Świat:
 							</text>
+							<text name="grid_builder_text">
+								+ Kliknij, by dodać światy
+							</text>
 						</layout_panel>
 						<layout_panel name="mode_selection">
 							<text name="mode_selection_text">
diff --git a/indra/newview/skins/default/xui/ru/panel_fs_login.xml b/indra/newview/skins/default/xui/ru/panel_fs_login.xml
index c5ba3bbd22..a6ee2abfe8 100644
--- a/indra/newview/skins/default/xui/ru/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_fs_login.xml
@@ -28,6 +28,9 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel name="grid_panel">
+			<text name="grid_builder_text" width="300">
+				+ Нажмите чтобы добавить больше сеток
+			</text>
 			<text name="grid_login_text">
 				Подключиться к сетке:
 			</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml
index 4d1ae4bc90..b64cdf63c9 100644
--- a/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml
@@ -33,6 +33,7 @@
           <layout_stack name="2nd_row_stack">
             <layout_panel name="grid_panel">
               <text name="grid_login_text" width="45">Сеть:</text>
+              <text name="grid_builder_text" width="300">+ Нажмите чтобы добавить больше сеток</text>
             </layout_panel>
             <layout_panel name="mode_selection">
               <text name="mode_selection_text">Режим:</text>

From f862fc375cfec8c020a811f66c999c6a438d1bc5 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 4 Jun 2024 01:19:04 +0100
Subject: [PATCH 39/42] Disable the pointless hardware check unless someone
 really wants them

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llappviewer.cpp           |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fcb8f9febb..f6f33b84dc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13761,6 +13761,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+  <key>FSUseLegacyUnsupportedHardwareChecks</key>
+    <map>
+      <key>Comment</key>
+      <string>If enabled, Firestorm will perform utterly pointless checks that probably made sense in 2004.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+  </map>
   <key>FSUseStandaloneGroupFloater</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5da9af8c81..0efacea44f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1163,7 +1163,7 @@ bool LLAppViewer::init()
     }
 
     // alert the user if they are using unsupported hardware
-    if(!gSavedSettings.getBOOL("AlertedUnsupportedHardware"))
+    if(gSavedSettings.getBOOL("FSUseLegacyUnsupportedHardwareChecks") && !gSavedSettings.getBOOL("AlertedUnsupportedHardware"))
     {
         bool unsupported = false;
         LLSD args;

From 2a73551f8b5640c50f943b5944b43699b5031dd7 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 4 Jun 2024 01:26:59 +0100
Subject: [PATCH 40/42] FIRE-33958 - Tentative fix for zombie notifications

I've only had limited success in reproducing this, so that fact I can't repro after fixing is not that compelling. However, when the issue occurs the underlying notification has been removed but the UI remains, this seems consistent with notification list being updated outside of the mutex guard and causing issues.
Note: LLNotifications has a number of methods that do an initial find and then call updateItem. I have not, at this point locked the higher livel calls as the updateItem call itself is locked and the higher level find is not likely to be problematic. If problems persist we can try guarding those too.
---
 indra/llui/llnotifications.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 9ae60ab301..052987b69f 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1014,6 +1014,7 @@ LLBoundListener LLNotificationChannelBase::connectChangedImpl(const LLEventListe
 
 LLBoundListener LLNotificationChannelBase::connectAtFrontChangedImpl(const LLEventListener& slot)
 {
+    LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against against unlocked access to mItems
     for (LLNotificationSet::iterator it = mItems.begin(); it != mItems.end(); ++it)
     {
         slot(LLSD().with("sigtype", "load").with("id", (*it)->id()));
@@ -1052,10 +1053,17 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload)
 bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPtr pNotification)
 {
     std::string cmd = payload["sigtype"];
-    LLNotificationSet::iterator foundItem = mItems.find(pNotification);
-    bool wasFound = (foundItem != mItems.end());
+    // <FS:Beq> Guard against unlocked access to mItems
+    // LLNotificationSet::iterator foundItem = mItems.find(pNotification);
+    // bool wasFound = (foundItem != mItems.end());
+    bool wasFound = false;
+    {
+        LLMutexLock lock(&mItemsMutex);
+        LLNotificationSet::iterator foundItem = mItems.find(pNotification);
+        wasFound = (foundItem != mItems.end());
+    } 
+    // </FS:Beq>
     bool passesFilter = mFilter ? mFilter(pNotification) : true;
-
     // first, we offer the result of the filter test to the simple
     // signals for pass/fail. One of these is guaranteed to be called.
     // If either signal returns true, the change processing is NOT performed
@@ -1084,6 +1092,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
         assert(!wasFound);
         if (passesFilter)
         {
+          LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
             // not in our list, add it and say so
             mItems.insert(pNotification);
             onLoad(pNotification);
@@ -1107,6 +1116,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
             }
             else
             {
+                LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
                 // not in our list, add it and say so
                 mItems.insert(pNotification);
                 onChange(pNotification);
@@ -1120,6 +1130,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
         {
             if (wasFound)
             {
+                LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
                 // it already existed, so this is a delete
                 mItems.erase(pNotification);
                 onChange(pNotification);
@@ -1138,6 +1149,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
         assert(!wasFound);
         if (passesFilter)
         {
+            LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
             // not in our list, add it and say so
             mItems.insert(pNotification);
             onAdd(pNotification);
@@ -1149,6 +1161,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
         // if we have it in our list, pass on the delete, then delete it, else do nothing
         if (wasFound)
         {
+            LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
             onDelete(pNotification);
             abortProcessing = mChanged(payload);
             mItems.erase(pNotification);
@@ -1714,6 +1727,7 @@ void LLNotifications::add(const LLNotificationPtr pNotif)
     if (pNotif == NULL) return;
 
     // first see if we already have it -- if so, that's a problem
+    LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked acceess to mItems
     LLNotificationSet::iterator it=mItems.find(pNotif);
     if (it != mItems.end())
     {

From 7c1b60aeba3b08aacb3c5e1d66139db911259869 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 4 Jun 2024 21:32:42 +0200
Subject: [PATCH 41/42] Enable multi-properties floater for task inventory

---
 indra/newview/llpanelobjectinventory.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index ac2459be80..459a33d111 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -627,13 +627,12 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 // [/RLVa:KB]
     }
     items.push_back(std::string("Task Properties"));
-    // <FS:Ansariel> Legacy object properties
+    // <FS:Ansariel> Improved object properties
     //if ((flags & FIRST_SELECTED_ITEM) == 0)
-    if (!gSavedSettings.getBOOL("FSUseLegacyObjectProperties") && (flags & FIRST_SELECTED_ITEM) == 0)
+    //{
+    //    disabled_items.push_back(std::string("Task Properties"));
+    //}
     // </FS:Ansariel>
-    {
-        disabled_items.push_back(std::string("Task Properties"));
-    }
 // [RLVa:KB] - Checked: 2010-09-28 (RLVa-1.2.1f) | Added: RLVa-1.2.1f
     items.push_back(std::string("Task Rename"));
     if ( (!isItemRenameable()) || ((flags & FIRST_SELECTED_ITEM) == 0) )
@@ -1007,13 +1006,12 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
         }
     }
     items.push_back(std::string("Task Properties"));
-    // <FS:Ansariel> Legacy object properties
+    // <FS:Ansariel> Improved object properties
     //if ((flags & FIRST_SELECTED_ITEM) == 0)
-    if (!gSavedSettings.getBOOL("FSUseLegacyObjectProperties") && (flags & FIRST_SELECTED_ITEM) == 0)
+    //{
+    //    disabled_items.push_back(std::string("Task Properties"));
+    //}
     // </FS:Ansariel>
-    {
-        disabled_items.push_back(std::string("Task Properties"));
-    }
     if(isItemRenameable())
     {
         items.push_back(std::string("Task Rename"));

From 7d779aacaf2d821f922606bcc931e4f687931c4e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 5 Jun 2024 12:05:31 +0200
Subject: [PATCH 42/42] Hide option to add grids on Havok-Builds

---
 indra/newview/fspanellogin.cpp                            | 3 +++
 indra/newview/skins/default/xui/en/panel_fs_login.xml     | 3 ++-
 indra/newview/skins/default/xui/en/panel_fs_nui_login.xml | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp
index 222b5dbd4e..b645b3430d 100644
--- a/indra/newview/fspanellogin.cpp
+++ b/indra/newview/fspanellogin.cpp
@@ -250,8 +250,11 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
     LLTextBox* grid_mgr_help_text = getChild<LLTextBox>("grid_login_text");
     grid_mgr_help_text->setClickedCallback(onClickGridMgrHelp, NULL);
 
+#ifdef OPENSIM
     LLTextBox* grid_builder_text = getChild<LLTextBox>("grid_builder_text");
     grid_builder_text->setClickedCallback(onClickGridBuilder, NULL);
+    grid_builder_text->setVisible(true);
+#endif
 
     LLSLURL start_slurl(LLStartUp::getStartSLURL());
     // The StartSLURL might have been set either by an explicit command-line
diff --git a/indra/newview/skins/default/xui/en/panel_fs_login.xml b/indra/newview/skins/default/xui/en/panel_fs_login.xml
index 52500edb4f..eb071fed6a 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml
@@ -187,7 +187,8 @@
         height="16"
         name="grid_builder_text"
         left="5"
-        width="190">
+        width="190"
+        visible="false">
       + Click to add more grids
       </text>
       <text
diff --git a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
index a709af3ecb..edd1b2003e 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
@@ -291,7 +291,8 @@
       name="grid_builder_text"
       valign="center"
       left="45"
-      width="250">
+      width="250"
+      visible="false">
     + Click to add more grids
     </text>
     </layout_panel>