Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

2023-08-09 11:15:37 +02:00 · 2023-08-09 11:15:37 +02:00 · 2b3c2400e8
parent cb1cb4b505 5511564da1
commit 2b3c2400e8
12 changed files with 74 additions and 36 deletions
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@ -2,8 +2,9 @@ name: Build viewer
 on:
  push:
    branches:
-      - "*release"
-      - master
+      - "Firestorm*.*.*"
+    tags:
+      - "preview"
  schedule:
    - cron: '00 03 * * *' # Run every day at 3am UTC
 env:    
@ -74,14 +75,14 @@ jobs:

      - name: find channel from Branch name
        run: | 
-          if [[ "${{ github.ref_name }}" == *Release* ]]; then
+          if [[ "${{ github.ref_name }}" == Firestorm* ]]; then
            FS_RELEASE_TYPE=Release
+          elif [[ "${{ github.ref_name }}" == *review* ]]; then
+            FS_RELEASE_TYPE=Beta
+          elif [[ "${{ github.event_name }}" == 'schedule' ]]; then
+            FS_RELEASE_TYPE=Nightly
          else
-            if [[ "${{github.event_name}}" == 'schedule' ]]; then
-              FS_RELEASE_TYPE=Nightly
-            else
-              FS_RELEASE_TYPE=Beta
-            fi
+            FS_RELEASE_TYPE=Unknown
          fi
          if [[ "${{ matrix.addrsize }}" == "64" ]]; then
            FS_RELEASE_CHAN="${FS_RELEASE_TYPE}x64"
@ -118,7 +119,11 @@ jobs:
        shell: bash

      - name: rclone the private 3p packages for this platform (both 64 & 32)
-        run: 'rclone copy fs_bundles: --include "*${{ env.fallback_platform }}*bz2" .'
+        run: 'rclone copy fs_bundles: --filter "- Alpha/*" --filter "+ *${{ env.fallback_platform }}*bz2" .'
+        
+      - name: rclone any extra private 3p packages for Alpha (allows library updates not in the main repo)
+        if: env.FS_BUILD_TYPE == 'Alpha'
+        run: 'rclone copy fs_bundles:Alpha --include "*${{ env.fallback_platform }}*bz2" .'

      - name: set VSVER for Windows builds
        if: runner.os == 'Windows'
@ -255,17 +260,17 @@ jobs:

      - name: find channel and webhook from Branch name
        run: | 
-          if [[ "${{ github.ref_name }}" == *Release* ]]; then
+          if [[ "${{ github.ref_name }}" == Firestorm* ]]; then
            FS_RELEASE_FOLDER=release
            FS_BUILD_WEBHOOK_URL=${{ secrets.RELEASE_WEBHOOK_URL }}
-            else
-            if [[ "${{github.event_name}}" == 'schedule' ]]; then
-            FS_RELEASE_FOLDER=nightly
-            FS_BUILD_WEBHOOK_URL=${{ secrets.NIGHTLY_WEBHOOK_URL }}
-            else
+          elif [[ "${{ github.ref_name }}" == *review* ]]; then
            FS_RELEASE_FOLDER=preview
            FS_BUILD_WEBHOOK_URL=${{ secrets.BETA_WEBHOOK_URL }}
-            fi
+          elif [[ "${{ github.event_name }}" == 'schedule' ]]; then
+            FS_RELEASE_FOLDER=nightly
+            FS_BUILD_WEBHOOK_URL=${{ secrets.NIGHTLY_WEBHOOK_URL }}
+          else
+            FS_RELEASE_TYPE=Unknown
          fi
          echo "FS_RELEASE_FOLDER=${FS_RELEASE_FOLDER}" >> $GITHUB_ENV
          echo "FS_BUILD_WEBHOOK_URL=${FS_BUILD_WEBHOOK_URL}" >> $GITHUB_ENV
--- a/indra/llmessage/llregionflags.h
+++ b/indra/llmessage/llregionflags.h
@ -171,8 +171,11 @@ const U32 ESTATE_ACCESS_MANAGER_REMOVE				= 1U << 9;
 const U32 ESTATE_ACCESS_NO_REPLY						= 1U << 10;
 const U32 ESTATE_ACCESS_FAILED_BAN_ESTATE_MANAGER	= 1U << 11;

-const S32 ESTATE_MAX_MANAGERS = 15;
-const S32 ESTATE_MAX_ACCESS_IDS = 500;	// max for access, banned
+const S32 ESTATE_MAX_MANAGERS = 20;
+const S32 ESTATE_MAX_MANAGERS_OS = 15; // <FS:Ansariel> OpenSim
+const S32 ESTATE_MAX_ACCESS_IDS = 500;	// max for access
+const S32 ESTATE_MAX_BANNED_IDS = 750;	// max for banned
+const S32 ESTATE_MAX_BANNED_IDS_OS = 500;	// max for banned // <FS:Ansariel> OpenSim
 const S32 ESTATE_MAX_GROUP_IDS = (S32) ESTATE_ACCESS_MAX_ENTRIES_PER_PACKET;

 // 'Sim Wide Delete' flags
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@ -26438,5 +26438,16 @@ Change of this parameter will affect the layout of buttons in notification toast
      <key>Value</key>
      <integer>0</integer>
    </map>
+    <key>FSSortAttachmentSpotsAlphabetically</key>
+    <map>
+      <key>Comment</key>
+      <string>Sorts the attachment spots in the "Attach to" menus alphabetically</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
 </map>
 </llsd>
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@ -3031,7 +3031,7 @@ BOOL LLPanelEstateAccess::postBuild()
 	if (banned_name_list)
 	{
 		banned_name_list->setCommitOnSelectionChange(TRUE);
-		banned_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
+		banned_name_list->setMaxItemCount(LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS); // <FS:Ansariel> OpenSim
 	}

 	getChild<LLUICtrl>("banned_search_input")->setCommitCallback(boost::bind(&LLPanelEstateAccess::onBannedSearchEdit, this, _2));
@ -3044,7 +3044,7 @@ BOOL LLPanelEstateAccess::postBuild()
 	if (manager_name_list)
 	{
 		manager_name_list->setCommitOnSelectionChange(TRUE);
-		manager_name_list->setMaxItemCount(ESTATE_MAX_MANAGERS * 4);	// Allow extras for dupe issue
+		manager_name_list->setMaxItemCount((LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_MANAGERS : ESTATE_MAX_MANAGERS_OS) * 4);	// Allow extras for dupe issue // <FS:Ansariel> OpenSim
 	}

 	childSetAction("add_estate_manager_btn", boost::bind(&LLPanelEstateAccess::onClickAddEstateManager, this));
@ -3175,10 +3175,10 @@ void LLPanelEstateAccess::onClickAddBannedAgent()
 {
 	LLCtrlListInterface *list = childGetListInterface("banned_avatar_name_list");
 	if (!list) return;
-	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
+	if (list->getItemCount() >= (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)) // <FS:Ansariel> OpenSim
 	{
 		LLSD args;
-		args["MAX_BANNED"] = llformat("%d", ESTATE_MAX_ACCESS_IDS);
+		args["MAX_BANNED"] = llformat("%d", (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)); // <FS:Ansariel> OpenSim
 		LLNotificationsUtil::add("MaxBannedAgentsOnRegion", args);
 		return;
 	}
@ -3210,10 +3210,10 @@ void LLPanelEstateAccess::onClickAddEstateManager()
 {
 	LLCtrlListInterface *list = childGetListInterface("estate_manager_name_list");
 	if (!list) return;
-	if (list->getItemCount() >= ESTATE_MAX_MANAGERS)
+	if (list->getItemCount() >= (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_MANAGERS : ESTATE_MAX_MANAGERS_OS)) // <FS:Ansariel> OpenSim
 	{	// Tell user they can't add more managers
 		LLSD args;
-		args["MAX_MANAGER"] = llformat("%d", ESTATE_MAX_MANAGERS);
+		args["MAX_MANAGER"] = llformat("%d", (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_MANAGERS : ESTATE_MAX_MANAGERS_OS)); // <FS:Ansariel> OpenSim
 		LLNotificationsUtil::add("MaxManagersOnRegion", args);
 	}
 	else
@ -3416,13 +3416,13 @@ void LLPanelEstateAccess::accessAddCore3(const uuid_vec_t& ids, std::vector<LLAv
 		LLNameListCtrl* name_list = panel->getChild<LLNameListCtrl>("banned_avatar_name_list");
 		LLNameListCtrl* em_list = panel->getChild<LLNameListCtrl>("estate_manager_name_list");
 		int currentCount = (name_list ? name_list->getItemCount() : 0);
-		if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
+		if (ids.size() + currentCount > (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)) // <FS:Ansariel> OpenSim
 		{
 			LLSD args;
 			args["NUM_ADDED"] = llformat("%d", ids.size());
-			args["MAX_AGENTS"] = llformat("%d", ESTATE_MAX_ACCESS_IDS);
+			args["MAX_AGENTS"] = llformat("%d", (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)); // <FS:Ansariel> OpenSim
 			args["LIST_TYPE"] = LLTrans::getString("RegionInfoListTypeBannedAgents");
-			args["NUM_EXCESS"] = llformat("%d", (ids.size() + currentCount) - ESTATE_MAX_ACCESS_IDS);
+			args["NUM_EXCESS"] = llformat("%d", (ids.size() + currentCount) - (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)); // <FS:Ansariel> OpenSim
 			LLNotificationsUtil::add("MaxAgentOnRegionBatch", args);
 			delete change_info;
 			return;
@ -3801,7 +3801,7 @@ void LLPanelEstateAccess::requestEstateGetAccessCoro(std::string url)
 	{
 		LLStringUtil::format_map_t args;
 		args["[BANNEDAGENTS]"] = llformat("%d", result["BannedAgents"].size());
-		args["[MAXBANNED]"] = llformat("%d", ESTATE_MAX_ACCESS_IDS);
+		args["[MAXBANNED]"] = llformat("%d", (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)); // <FS:Ansariel> OpenSim
 		std::string msg = LLTrans::getString("RegionInfoBannedResidents", args);
 		panel->getChild<LLUICtrl>("ban_resident_label")->setValue(LLSD(msg));

@ -3863,7 +3863,7 @@ void LLPanelEstateAccess::requestEstateGetAccessCoro(std::string url)
 	{
 		LLStringUtil::format_map_t args;
 		args["[ESTATEMANAGERS]"] = llformat("%d", result["Managers"].size());
-		args["[MAXMANAGERS]"] = llformat("%d", ESTATE_MAX_MANAGERS);
+		args["[MAXMANAGERS]"] = llformat("%d", (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_MANAGERS : ESTATE_MAX_MANAGERS_OS)); // <FS:Ansariel> OpenSim
 		std::string msg = LLTrans::getString("RegionInfoEstateManagers", args);
 		panel->getChild<LLUICtrl>("estate_manager_label")->setValue(LLSD(msg));

--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@ -7479,8 +7479,11 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 					}

 					// <FS:Ansariel> FIRE-21200: Attachment Points List in Alphabetical Order
-					attach_menu->getItems()->sort(LLViewerAttachMenu::sort());
-					attach_hud_menu->getItems()->sort(LLViewerAttachMenu::sort());
+					if (gSavedSettings.getBOOL("FSSortAttachmentSpotsAlphabetically"))
+					{
+						attach_menu->getItems()->sort(LLViewerAttachMenu::sort());
+						attach_hud_menu->getItems()->sort(LLViewerAttachMenu::sort());
+					}
 					// </FS:Ansariel>
 				}
 			}
--- a/indra/newview/llviewerattachmenu.cpp
+++ b/indra/newview/llviewerattachmenu.cpp
@ -90,8 +90,11 @@ void LLViewerAttachMenu::populateMenus(const std::string& attach_to_menu_name, c
 	}

 	// <FS:Ansariel> FIRE-21200: Attachment Points List in Alphabetical Order
-	attach_menu->getItems()->sort(LLViewerAttachMenu::sort());
-	attach_hud_menu->getItems()->sort(LLViewerAttachMenu::sort());
+	if (gSavedSettings.getBOOL("FSSortAttachmentSpotsAlphabetically"))
+	{
+		attach_menu->getItems()->sort(LLViewerAttachMenu::sort());
+		attach_hud_menu->getItems()->sort(LLViewerAttachMenu::sort());
+	}
 	// </FS:Ansariel>
 }

--- a/indra/newview/skins/default/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences.xml
@ -3,7 +3,7 @@
 	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
 	<panel name="search_panel">
-		<search_editor label="Sucheinstellungen" name="search_prefs_edit" tool_tip="Geben Sie hier den gewünschten Suchbegriff ein. Die Ergebnisse werden für teilweise Volltext-Treffer innerhalb des Einstellungsnamens oder Kommentars angezeigt."/>
+		<search_editor label="Einstellungen durchsuchen" name="search_prefs_edit" tool_tip="Geben Sie hier den gewünschten Suchbegriff ein. Die Ergebnisse werden für teilweise Volltext-Treffer innerhalb des Einstellungsnamens oder Kommentars angezeigt."/>
 		<button name="copy_search_slurl_btn" tool_tip="Suchbegriff als SLURL kopieren"/>
 	</panel>
 	<tab_container name="pref core">
--- a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
@ -136,7 +136,7 @@
 		<text left="370" name="text_box_objprams3">
 			Textur
 		</text>
-        <view_border name="TextureBorder" width="270"/>
+		<view_border name="TextureBorder" width="270"/>
 		<spinner label="X-Größe" name="X size" label_width="50" width="120"/>
 		<spinner label="Y-Größe" name="Y size" label_width="50" width="120"/>
 		<spinner label="Z-Größe" name="Z size" label_width="50" width="120"/>
@ -162,7 +162,7 @@
 			<combo_item name="Low" label="Niedrid"/>
 			<combo_item name="Medium" label="Mittel"/>
 			<combo_item name="High" label="Hoch"/>
-        </combo_box>
+		</combo_box>
 		<check_box name="FSBuildPrefs_EmbedItem" label="Objekt zu neuem Prim hinzufügen"/>
 		<fs_embedded_item_drop_target name="embed_item" tool_tip="Gegenstand aus Inventar hier ablegen">
 			Gegenstand aus Inventar hier ablegen
@ -239,6 +239,7 @@
 		<check_box label="Vorschau von Animation beim Upload am eigenen Avatar" tool_tip="Falls aktiviert, werden Animationen in der Vorschau am eigenen Avatar abgespielt" name="FSUploadAnimationOnOwnAvatar"/>
 		<check_box label="Immer erweiterte Informationen zu Animationen anzeigen" tool_tip="Erweiterte Informationen zu Animation im Eigentschaftsfenster anzeigen" name="FSAnimationPreviewExpanded"/>
 		<check_box label="Erweiterte Skript-Informationen aktivieren" tool_tip="Falls aktiviert, werden die Skript-Informationen um weitergehende Details ergänzt." name="FSScriptInfoExtended"/>
+		<check_box label="Anhänge-Punkte in „Anhängen an“-Menüs alphabetisch sortieren (Erfordert Neustart)" tool_tip="Falls aktiviert, werden die Einträge in den „Anhängen an“-Menüs alphabetisch sortiert." name="FSSortAttachmentSpotsAlphabetically"/>
 	</panel>

 	<!--Uploads-->
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@ -1646,6 +1646,14 @@
         name="FSScriptInfoExtended"
         enabled_control="UseLSLBridge"
         control_name="FSScriptInfoExtended"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Sort attachment spots in &quot;Attach to&quot; menus alphabetically (requires restart)"
+         tool_tip="If enabled, the list of attachments spots in the &amp;Attach to&amp; menus will be sorted alphabetically"
+         name="FSSortAttachmentSpotsAlphabetically"
+         control_name="FSSortAttachmentSpotsAlphabetically"/>
    </panel>

    <!--Uploads-->
--- a/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml
@ -155,6 +155,7 @@
 			<check_box label="Prévisualiser les animations sur son avatar pendant le téléchargement sur le serveur" tool_tip="Si activé, vous pouvez prévisualiser les animations sur votre propre avatar pendant le téléchargement sur le serveur" name="FSUploadAnimationOnOwnAvatar"/>
 			<check_box label="Toujours développer les informations détaillées de la prévisualisation de l'animation" tool_tip="Développer par défaut les informations détaillées sur l'animation dans le flotteur de l'aperçu de l'animation" name="FSAnimationPreviewExpanded"/>
 			<check_box label="Active les informations détaillées pour les script" tool_tip="Activée, ajoute aux informations de base sur les scripts des détails utiles aux créateurs" name="FSScriptInfoExtended"/>
+			<check_box label="Trier par ordre alphabétique les points d'attachement dans les menus &quot;Attacher à&quot; (redémarrage requis)" tool_tip="Si cette option est activée, la liste des points d'attachement dans les menus &amp;Attacher à&amp; sera triée par ordre alphabétique." name="FSSortAttachmentSpotsAlphabetically"/>
 		</panel>
 		<panel label="Chargements" name="UploadsTab">
 			<text name="title">Dossiers de destination pour les chargements :</text>
--- a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
@ -213,6 +213,7 @@
        <check_box label="Podgląd animacji na własnym awatarze podczas przesyłania ich na serwer" tool_tip="Gdy zaznaczysz tą opcję, to będziesz w stanie oglądać animacje na swoim własnym awatarze podczas przesyłania ich na serwer" name="FSUploadAnimationOnOwnAvatar" />
 		<check_box label="Zawsze rozwijaj zaawansowane informacje o podglądzie animacji" tool_tip="Domyślnie rozwiń zaawansowane informacje o animacji w oknie podglądu animacji" name="FSAnimationPreviewExpanded" />
        <check_box label="Włącz rozszerzanie funkcjonalności informacji o skryptach" tool_tip="Gdy zaznaczysz tą opcję, to podstawowa funkcjonalność informacji o skryptach zostanie rozszerzona za pomocą różnych szczegółów przydatnych dla budowniczych" name="FSScriptInfoExtended" />
+		<check_box label="Sortuj miejsca dodatków w sekcjach menu &quot;Dołącz do&quot; alfabetycznie (wymaga restartu)" tool_tip="Jeśli ta opcja jest włączona, to lista miejsc dla doczepienia dodatków pojawiająca się w menusach &quot;Dołącz do&quot; będzie posortowana alfabetycznie" name="FSSortAttachmentSpotsAlphabetically" />
    </panel>
    <panel label="Nowe pliki" name="UploadsTab">
        <text name="title">
--- a/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml
@ -218,7 +218,9 @@
        <check_box label="Используйте Ctrl + мышь, чтобы захватить и манипулировать объектами" tool_tip="Используйте Ctrl + мышь, чтобы захватить и манипулировать объектами" name="FSEnableGrab" />
        <check_box label="Масштабирование при нажатии (вместе с caps lock) для текстур при строительстве" tool_tip="При включении, позволяет тянуть при нажатии или масштаб при нажатии (вместе с caps lock) для текстур в режиме строительства. Эта функция эксперементальная и ее следует использовать с осторожностью." name="FSExperimentalDragTexture" />
        <check_box label="Предварительный просмотр анимации на собственном аватара во время загрузки" tool_tip="Предварительный просмотр анимации на собственном аватара во время загрузки" name="FSUploadAnimationOnOwnAvatar" />
+        <check_box label="Всегда раскрывать расширенную информацию в предпросмотре анимации" tool_tip="Развернуть расширенную информацию об анимации в всплывающем окне предварительного просмотра анимации по умолчанию." name="FSAnimationPreviewExpanded"/>
        <check_box label="Включить расширенную информацию скрипта" name="FSScriptInfoExtended" tool_tip="Если включено, расширяет базовую функцию информации скрипта с различными деталями, полезными для строителей"/>
+        <check_box label="Сортировка мест прикрепления в &quot;Прикрепить к&quot; меню по алфавиту (требуется перезагрузка)" tool_tip="Если этот параметр включен, список прикреплений в &amp;Прикрепить к&amp; меню будут отсортированы по алфавиту" name="FSSortAttachmentSpotsAlphabetically"/>
    </panel>
    <!--Uploads-->
    <panel label="Загрузки" name="UploadsTab">