From b3bde7a446daf945bd9cd5a8e21be7f2c2364c57 Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 1 Aug 2023 12:18:48 +0100 Subject: [PATCH 01/10] improved trigger on GHA --- .github/workflows/build_viewer.yml | 31 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index 8adc9171c1..197a20b10d 100644 --- 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" @@ -255,17 +256,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 From f4b014076cda53ae830e4362f1c735cc17d5da8c Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Thu, 20 Jul 2023 01:55:50 +0300 Subject: [PATCH 02/10] SL-19948 Update estate manager and ban list limits to match new values from simulator --- indra/llmessage/llregionflags.h | 5 +++-- indra/newview/llfloaterregioninfo.cpp | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/indra/llmessage/llregionflags.h b/indra/llmessage/llregionflags.h index 8548ed51e7..464bf05250 100644 --- a/indra/llmessage/llregionflags.h +++ b/indra/llmessage/llregionflags.h @@ -171,8 +171,9 @@ 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_ACCESS_IDS = 500; // max for access +const S32 ESTATE_MAX_BANNED_IDS = 750; // max for banned const S32 ESTATE_MAX_GROUP_IDS = (S32) ESTATE_ACCESS_MAX_ENTRIES_PER_PACKET; // 'Sim Wide Delete' flags diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index af1932a85e..33adad8f92 100644 --- 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(ESTATE_MAX_BANNED_IDS); } getChild("banned_search_input")->setCommitCallback(boost::bind(&LLPanelEstateAccess::onBannedSearchEdit, this, _2)); @@ -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() >= ESTATE_MAX_BANNED_IDS) { LLSD args; - args["MAX_BANNED"] = llformat("%d", ESTATE_MAX_ACCESS_IDS); + args["MAX_BANNED"] = llformat("%d", ESTATE_MAX_BANNED_IDS); LLNotificationsUtil::add("MaxBannedAgentsOnRegion", args); return; } @@ -3416,13 +3416,13 @@ void LLPanelEstateAccess::accessAddCore3(const uuid_vec_t& ids, std::vectorgetChild("banned_avatar_name_list"); LLNameListCtrl* em_list = panel->getChild("estate_manager_name_list"); int currentCount = (name_list ? name_list->getItemCount() : 0); - if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS) + if (ids.size() + currentCount > ESTATE_MAX_BANNED_IDS) { LLSD args; args["NUM_ADDED"] = llformat("%d", ids.size()); - args["MAX_AGENTS"] = llformat("%d", ESTATE_MAX_ACCESS_IDS); + args["MAX_AGENTS"] = llformat("%d", ESTATE_MAX_BANNED_IDS); 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) - ESTATE_MAX_BANNED_IDS); 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", ESTATE_MAX_BANNED_IDS); std::string msg = LLTrans::getString("RegionInfoBannedResidents", args); panel->getChild("ban_resident_label")->setValue(LLSD(msg)); From ded186096d2632af33110556114106de516540b8 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 3 Aug 2023 13:45:38 +0200 Subject: [PATCH 03/10] Assume legacy estate limits for OpenSim --- indra/llmessage/llregionflags.h | 2 ++ indra/newview/llfloaterregioninfo.cpp | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/indra/llmessage/llregionflags.h b/indra/llmessage/llregionflags.h index 464bf05250..703bf08345 100644 --- a/indra/llmessage/llregionflags.h +++ b/indra/llmessage/llregionflags.h @@ -172,8 +172,10 @@ const U32 ESTATE_ACCESS_NO_REPLY = 1U << 10; const U32 ESTATE_ACCESS_FAILED_BAN_ESTATE_MANAGER = 1U << 11; const S32 ESTATE_MAX_MANAGERS = 20; +const S32 ESTATE_MAX_MANAGERS_OS = 15; // 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 // OpenSim const S32 ESTATE_MAX_GROUP_IDS = (S32) ESTATE_ACCESS_MAX_ENTRIES_PER_PACKET; // 'Sim Wide Delete' flags diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 33adad8f92..1254aa2c7a 100644 --- 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_BANNED_IDS); + banned_name_list->setMaxItemCount(LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS); // OpenSim } getChild("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 // 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_BANNED_IDS) + if (list->getItemCount() >= (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)) // OpenSim { LLSD args; - args["MAX_BANNED"] = llformat("%d", ESTATE_MAX_BANNED_IDS); + args["MAX_BANNED"] = llformat("%d", (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)); // 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)) // 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)); // OpenSim LLNotificationsUtil::add("MaxManagersOnRegion", args); } else @@ -3416,13 +3416,13 @@ void LLPanelEstateAccess::accessAddCore3(const uuid_vec_t& ids, std::vectorgetChild("banned_avatar_name_list"); LLNameListCtrl* em_list = panel->getChild("estate_manager_name_list"); int currentCount = (name_list ? name_list->getItemCount() : 0); - if (ids.size() + currentCount > ESTATE_MAX_BANNED_IDS) + if (ids.size() + currentCount > (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)) // OpenSim { LLSD args; args["NUM_ADDED"] = llformat("%d", ids.size()); - args["MAX_AGENTS"] = llformat("%d", ESTATE_MAX_BANNED_IDS); + args["MAX_AGENTS"] = llformat("%d", (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)); // OpenSim args["LIST_TYPE"] = LLTrans::getString("RegionInfoListTypeBannedAgents"); - args["NUM_EXCESS"] = llformat("%d", (ids.size() + currentCount) - ESTATE_MAX_BANNED_IDS); + args["NUM_EXCESS"] = llformat("%d", (ids.size() + currentCount) - (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)); // 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_BANNED_IDS); + args["[MAXBANNED]"] = llformat("%d", (LLGridManager::instance().isInSecondLife() ? ESTATE_MAX_BANNED_IDS : ESTATE_MAX_BANNED_IDS_OS)); // OpenSim std::string msg = LLTrans::getString("RegionInfoBannedResidents", args); panel->getChild("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)); // OpenSim std::string msg = LLTrans::getString("RegionInfoEstateManagers", args); panel->getChild("estate_manager_label")->setValue(LLSD(msg)); From fb47a6394fac297b1b260385fb693f85cf2a7a92 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 4 Aug 2023 17:57:15 +0200 Subject: [PATCH 04/10] FIRE-33127: Made alphabetical sorting in "Attach to" menus optional --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llinventorybridge.cpp | 7 +++++-- indra/newview/llviewerattachmenu.cpp | 7 +++++-- .../default/xui/de/panel_preferences_firestorm.xml | 5 +++-- .../default/xui/en/panel_preferences_firestorm.xml | 8 ++++++++ 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ae8a970891..fba8cc0056 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -26394,5 +26394,16 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 + FSSortAttachmentSpotsAlphabetically + + Comment + Sorts the attachment spots in the "Attach to" menus alphabetically + Persist + 1 + Type + Boolean + Value + 1 + diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index d5570cd6f7..c9ed2693f4 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -7514,8 +7514,11 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) } // 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()); + } // } } diff --git a/indra/newview/llviewerattachmenu.cpp b/indra/newview/llviewerattachmenu.cpp index ed0a2fe342..cce9a5f7a4 100644 --- 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 } // 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()); + } // } diff --git a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml index 7aa948e83a..9472846608 100644 --- 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 @@ Textur - + @@ -162,7 +162,7 @@ - + Gegenstand aus Inventar hier ablegen @@ -239,6 +239,7 @@ + diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml index 1ccbb0ee84..f3cfd699eb 100644 --- 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"/> + From 4edc6d0adc2bfbf72184b0bbfdf4ddfb32c6a473 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 5 Aug 2023 18:01:17 +0200 Subject: [PATCH 05/10] Change LL_ERRS to LL_WARNS here, as this seems to be meant for debugging anyway; Also, fix a typo --- indra/newview/llviewerpartsim.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index f77ed8abaf..8585c76a08 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -476,12 +476,12 @@ void LLViewerPartSim::checkParticleCount(U32 size) { if(LLViewerPartSim::sParticleCount2 != LLViewerPartSim::sParticleCount) { - LL_ERRS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ; + LL_WARNS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ; } if(size > (U32)LLViewerPartSim::sParticleCount2) { - LL_ERRS() << "curren particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; + LL_WARNS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; } } From 0bf598dc8d0d38c56998ba7798fc0e57fbc669dd Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 5 Aug 2023 18:13:01 +0200 Subject: [PATCH 06/10] Updated French (by Laurent Bechir), Russian (by Romka Swallowtail) and Polish translations --- .../skins/default/xui/fr/panel_preferences_firestorm.xml | 1 + .../skins/default/xui/pl/panel_preferences_firestorm.xml | 1 + .../skins/default/xui/ru/panel_preferences_firestorm.xml | 2 ++ 3 files changed, 4 insertions(+) diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml index 3cbc0f239f..4171c8c283 100644 --- 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 @@ + Dossiers de destination pour les chargements : diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml index a5974ec2da..0623952059 100644 --- 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 @@ + diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml index 275894fb5d..d0743adb1b 100644 --- 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 @@ + + From 2e262de012ce7beeb5e3c995468c849782acddf3 Mon Sep 17 00:00:00 2001 From: Beq Date: Sun, 6 Aug 2023 20:02:11 +0100 Subject: [PATCH 07/10] Allow "alpha" builds to have alternate 3p libs Should fix nightlies. --- .github/workflows/build_viewer.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index 197a20b10d..6cfd9df478 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -118,8 +118,12 @@ jobs: echo "platform=${platform}" >> $GITHUB_ENV shell: bash - - name: rclone the private 3p packages for this platform (both 64 & 32) - run: 'rclone copy fs_bundles: --include "*${{ env.fallback_platform }}*bz2" .' + - name: rclone the private 3p packages for this platform (both 64 & 32) + 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' From b0217ec21af0460f3af5c5b040c9a50c7a57f149 Mon Sep 17 00:00:00 2001 From: Beq Date: Sun, 6 Aug 2023 20:08:43 +0100 Subject: [PATCH 08/10] bad indents kill yaml... --- .github/workflows/build_viewer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index 6cfd9df478..d85167e867 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -118,7 +118,7 @@ jobs: echo "platform=${platform}" >> $GITHUB_ENV shell: bash - - name: rclone the private 3p packages for this platform (both 64 & 32) + - name: rclone the private 3p packages for this platform (both 64 & 32) 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) From 68a433f477bdc61b83268d7daf8165fa911e0e47 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 5 Aug 2023 18:01:17 +0200 Subject: [PATCH 09/10] Revert "Change LL_ERRS to LL_WARNS here, as this seems to be meant for debugging anyway; Also, fix a typo" This reverts commit 4edc6d0adc2bfbf72184b0bbfdf4ddfb32c6a473. Until we can better understand the cause --- indra/newview/llviewerpartsim.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 8585c76a08..f77ed8abaf 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -476,12 +476,12 @@ void LLViewerPartSim::checkParticleCount(U32 size) { if(LLViewerPartSim::sParticleCount2 != LLViewerPartSim::sParticleCount) { - LL_WARNS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ; + LL_ERRS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ; } if(size > (U32)LLViewerPartSim::sParticleCount2) { - LL_WARNS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; + LL_ERRS() << "curren particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; } } From 5511564da1270956c4c65e639ab8d89b9e1ac0c0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 7 Aug 2023 12:25:58 +0200 Subject: [PATCH 10/10] FIRE-33135: Fix incorrect German translation --- indra/newview/skins/default/xui/de/floater_preferences.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml index f8d8485a22..46cf0c49fa 100644 --- a/indra/newview/skins/default/xui/de/floater_preferences.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences.xml @@ -3,7 +3,7 @@