From fb47a6394fac297b1b260385fb693f85cf2a7a92 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 4 Aug 2023 17:57:15 +0200 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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 @@