From 6ee21420bf6eed59d5be8df922179f94cd596c45 Mon Sep 17 00:00:00 2001 From: Beq Date: Thu, 19 Sep 2024 22:27:46 +0100 Subject: [PATCH 01/35] remove libfreetype from the manifest on linux --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 169fbf5e42..e2c3d4fd3f 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -2151,7 +2151,7 @@ class LinuxManifest(ViewerManifest): self.path("ca-bundle.crt") with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"): - self.path("libfreetype.so*") + # self.path("libfreetype.so*") self.path("libapr-1.so*") self.path("libaprutil-1.so*") #self.path("libboost_context-mt.so*") From 298f16b23593c14f4dc2f838381e2026ba4bea53 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 20 Sep 2024 13:16:45 +0200 Subject: [PATCH 02/35] Extend autohide pie menu function to also work with sub menus and not only slices --- indra/newview/CMakeLists.txt | 2 + indra/newview/pieautohide.cpp | 45 +++++++++++ indra/newview/pieautohide.h | 48 ++++++++++++ indra/newview/piemenu.cpp | 141 ++++++++++++++++++++-------------- indra/newview/piemenu.h | 13 +++- indra/newview/pieslice.cpp | 15 +--- indra/newview/pieslice.h | 9 +-- 7 files changed, 190 insertions(+), 83 deletions(-) create mode 100644 indra/newview/pieautohide.cpp create mode 100644 indra/newview/pieautohide.h diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 402350233c..f8300069ac 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -845,6 +845,7 @@ set(viewer_SOURCE_FILES noise.cpp particleeditor.cpp permissionstracker.cpp + pieautohide.cpp piemenu.cpp pieseparator.cpp pieslice.cpp @@ -1646,6 +1647,7 @@ set(viewer_HEADER_FILES noise.h particleeditor.h permissionstracker.h + pieautohide.h piemenu.h pieseparator.h pieslice.h diff --git a/indra/newview/pieautohide.cpp b/indra/newview/pieautohide.cpp new file mode 100644 index 0000000000..c8d64f822d --- /dev/null +++ b/indra/newview/pieautohide.cpp @@ -0,0 +1,45 @@ +/** + * @file pieautohide.cpp + * @brief Pie menu autohide base class + * + * $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 "pieautohide.h" + + +PieAutohide::PieAutohide(bool autohide, bool startAutohide) : mAutohide(autohide), mStartAutohide(startAutohide) {} + +// accessor +bool PieAutohide::getStartAutohide() const +{ + return mStartAutohide; +} + +// accessor +bool PieAutohide::getAutohide() const +{ + return mStartAutohide || mAutohide; +} diff --git a/indra/newview/pieautohide.h b/indra/newview/pieautohide.h new file mode 100644 index 0000000000..041df6d32d --- /dev/null +++ b/indra/newview/pieautohide.h @@ -0,0 +1,48 @@ +/** + * @file pieautohide.h + * @brief Pie menu autohide base class + * + * $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 PIEAUTOHIDE_H +#define PIEAUTOHIDE_H + +#include "lluictrl.h" + +// A slice in the pie that supports the auto-hide function. +class PieAutohide +{ +public: + PieAutohide(bool autohide, bool startAutohide); + + // accessor to expose the autohide feature + bool getStartAutohide() const; + bool getAutohide() const; + +protected: + bool mStartAutohide{ false }; + bool mAutohide{ false }; +}; + +#endif // PIEAUTOHIDE_H diff --git a/indra/newview/piemenu.cpp b/indra/newview/piemenu.cpp index a8d62c180d..1147cd13a4 100644 --- a/indra/newview/piemenu.cpp +++ b/indra/newview/piemenu.cpp @@ -56,8 +56,9 @@ constexpr F32 PIE_OUTER_SHADE_FACTOR = 1.09f; // size factor of the outer shad constexpr F32 PIE_SLICE_DIVIDER_WIDTH = 0.04f; // width of a slice divider in radians constexpr F32 PIE_MAX_SLICES_F = F32(PIE_MAX_SLICES); -PieMenu::PieMenu(const LLMenuGL::Params& p) : +PieMenu::PieMenu(const Params& p) : LLMenuGL(p), + PieAutohide(p.autohide, p.start_autohide), mCurrentSegment(-1), mOldSlice(nullptr), mSlice(nullptr), @@ -305,22 +306,21 @@ void PieMenu::draw() gl_washer_2d(PIE_OUTER_SIZE * factor, PIE_INNER_SIZE, steps, bgColor, borderColor); // set up an item list iterator to point at the beginning of the item list - slice_list_t::iterator cur_item_iter; - cur_item_iter = mSlices->begin(); + slice_list_t::iterator cur_item_iter{ mSlices->begin() }; // clear current slice pointer mSlice = nullptr; // current slice number is 0 - S32 num = 0; - bool wasAutohide = false; + S32 num{ 0 }; + bool wasAutohide{ false }; do { // standard item text color LLColor4 itemColor = textColor; // clear the label and set up the starting angle to draw in - std::string label(""); + std::string label{ "" }; F32 segmentStart = F_PI / (PIE_MAX_SLICES_F / 2.f) * (F32)num - F_PI / PIE_MAX_SLICES_F; // iterate through the list of slices @@ -328,16 +328,76 @@ void PieMenu::draw() { // get current slice item LLView* item = (*cur_item_iter); - - // check if this is a submenu or a normal click slice - PieSlice* currentSlice = dynamic_cast(item); - PieMenu* currentSubmenu = dynamic_cast(item); - // advance internally to the next slice item cur_item_iter++; + bool isSliceOrSubmenu{ false }; + + auto checkAutohide = [&](PieAutohide* autohideSlice) + { + // if the current slice is the start of an autohide chain, clear out previous chains + if (autohideSlice->getStartAutohide()) + { + wasAutohide = false; + } + + // check if the current slice is part of an autohide chain + if (autohideSlice->getAutohide()) + { + // if the previous item already won the autohide, skip this item + if (wasAutohide) + { + return true; + } + + // look at the next item in the pie + LLView* lookAhead = (*cur_item_iter); + // check if this is a normal click slice + if (PieSlice* lookSlice = dynamic_cast(lookAhead)) + { + // if the next item is part of the current autohide chain as well ... + if (lookSlice->getAutohide() && !lookSlice->getStartAutohide()) + { + // ... it's visible and it's enabled, skip the current one. + // the first visible and enabled item in autohide chains wins + // this is useful for Sit/Stand toggles + lookSlice->updateEnabled(); + lookSlice->updateVisible(); + if (lookSlice->getVisible() && lookSlice->getEnabled()) + { + return true; + } + + // this item won the autohide contest + wasAutohide = true; + } + } + else if (PieMenu* lookSlice = dynamic_cast(lookAhead)) + { + if (lookSlice->getAutohide() && !lookSlice->getStartAutohide()) + { + if (/*lookSlice->getVisible() &&*/ lookSlice->getEnabled()) // Menu is somehow always set to not visible... + { + return true; + } + + // this item won the autohide contest + wasAutohide = true; + } + } + } + else + { + // reset autohide chain + wasAutohide = false; + } + + return false; + }; // in case it is regular click slice - if (currentSlice) + if (PieSlice* currentSlice = dynamic_cast(item)) { + isSliceOrSubmenu = true; + // get the slice label and tell the slice to check if it's supposed to be visible label = currentSlice->getLabel(); currentSlice->updateVisible(); @@ -350,50 +410,8 @@ void PieMenu::draw() label = ""; } - // if the current slice is the start of an autohide chain, clear out previous chains - if (currentSlice->getStartAutohide()) - { - wasAutohide = false; - } - - // check if the current slice is part of an autohide chain - if (currentSlice->getAutohide()) - { - // if the previous item already won the autohide, skip this item - if (wasAutohide) - { - continue; - } - - // look at the next item in the pie - LLView* lookAhead = (*cur_item_iter); - // check if this is a normal click slice - PieSlice* lookSlice = dynamic_cast(lookAhead); - if (lookSlice) - { - // if the next item is part of the current autohide chain as well ... - if (lookSlice->getAutohide() && !lookSlice->getStartAutohide()) - { - // ... it's visible and it's enabled, skip the current one. - // the first visible and enabled item in autohide chains wins - // this is useful for Sit/Stand toggles - lookSlice->updateEnabled(); - lookSlice->updateVisible(); - if (lookSlice->getVisible() && lookSlice->getEnabled()) - { - continue; - } - - // this item won the autohide contest - wasAutohide = true; - } - } - } - else - { - // reset autohide chain - wasAutohide = false; - } + if (checkAutohide(currentSlice)) + continue; // check if the slice is currently enabled currentSlice->updateEnabled(); @@ -404,9 +422,14 @@ void PieMenu::draw() itemColor %= 0.3f; } } - // if it's a submenu just get the label - else if (currentSubmenu) + // if it's a submenu + else if (PieMenu* currentSubmenu = dynamic_cast(item)) { + isSliceOrSubmenu = true; + + if (checkAutohide(currentSubmenu)) + continue; + label = currentSubmenu->getLabel(); if (sPieMenuOuterRingShade) { @@ -415,7 +438,7 @@ void PieMenu::draw() } // if it's a slice or submenu, the mouse pointer is over the same segment as our counter and the item is enabled - if ((currentSlice || currentSubmenu) && (mCurrentSegment == num) && item->getEnabled()) + if (isSliceOrSubmenu && (mCurrentSegment == num) && item->getEnabled()) { // memorize the currently highlighted slice for later mSlice = item; diff --git a/indra/newview/piemenu.h b/indra/newview/piemenu.h index 40a0f0dbbe..55e2c5f70a 100644 --- a/indra/newview/piemenu.h +++ b/indra/newview/piemenu.h @@ -30,6 +30,7 @@ #include "llmenugl.h" #include "llframetimer.h" +#include "pieautohide.h" constexpr S32 PIE_MAX_SLICES = 8; @@ -39,15 +40,21 @@ struct PieChildRegistry : public LLChildRegistry LLSINGLETON_EMPTY_CTOR(PieChildRegistry); }; -class PieMenu : public LLMenuGL +class PieMenu : public LLMenuGL, public PieAutohide { public: // parameter block for the XUI factory struct Params : public LLInitParam::Block { Optional name; + // autohide feature to hide a disabled pie slice + Optional start_autohide; + // next item in an autohide chain + Optional autohide; - Params() + Params() : + start_autohide("start_autohide", false), + autohide("autohide", false) { visible = false; } @@ -56,7 +63,7 @@ public: // PieChildRegistry contains a list of allowed child types for the XUI definition typedef PieChildRegistry child_registry_t; - PieMenu(const LLMenuGL::Params& p); + PieMenu(const Params& p); /*virtual*/ void setVisible(bool visible); diff --git a/indra/newview/pieslice.cpp b/indra/newview/pieslice.cpp index 77ab4f1b96..83a037aa08 100644 --- a/indra/newview/pieslice.cpp +++ b/indra/newview/pieslice.cpp @@ -43,9 +43,8 @@ PieSlice::Params::Params() : // create a new slice and memorize the XUI parameters PieSlice::PieSlice(const PieSlice::Params& p) : LLUICtrl(p), + PieAutohide(p.autohide, p.start_autohide), mLabel(p.label), - mStartAutohide(p.start_autohide), - mAutohide(p.autohide), mCheckEnableOnce(p.check_enable_once), mDoUpdateEnabled(true) { @@ -140,18 +139,6 @@ void PieSlice::setLabel(std::string_view newLabel) mLabel = newLabel; } -// accessor -bool PieSlice::getStartAutohide() const -{ - return mStartAutohide; -} - -// accessor -bool PieSlice::getAutohide() const -{ - return mStartAutohide || mAutohide; -} - void PieSlice::resetUpdateEnabledCheck() { mDoUpdateEnabled = true; diff --git a/indra/newview/pieslice.h b/indra/newview/pieslice.h index 0643119a53..2f36447d35 100644 --- a/indra/newview/pieslice.h +++ b/indra/newview/pieslice.h @@ -29,10 +29,11 @@ #define PIESLICE_H #include "lluictrl.h" +#include "pieautohide.h" // A slice in the pie. Does nothing by itself, just stores the function and // parameter to be execued when the user clicks on this item -class PieSlice : public LLUICtrl +class PieSlice : public LLUICtrl, public PieAutohide { public: // parameter block for the XUI factory @@ -70,10 +71,6 @@ public: LLSD getValue() const; void setValue(const LLSD& value); - // accessor to expose the autohide feature - bool getStartAutohide() const; - bool getAutohide() const; - // callback connection for the onCommit method to launch the specified function boost::signals2::connection setClickCallback(const commit_signal_t::slot_type& cb) { @@ -91,8 +88,6 @@ public: protected: // accessor store std::string mLabel; - bool mStartAutohide; - bool mAutohide; bool mCheckEnableOnce; bool mDoUpdateEnabled; From f322f68fd653a4c5266f788e31f8ad27c755ee9c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 20 Sep 2024 13:17:16 +0200 Subject: [PATCH 03/35] Reapply "FIRE-34438 Add new Take options to Pie menu" This reverts commit 0840d3253cb2d472554b2c4555a6ef4b8b2c48c8. --- .../skins/default/xui/az/menu_pie_object.xml | 6 +- .../skins/default/xui/de/menu_pie_object.xml | 10 ++- .../skins/default/xui/en/menu_pie_object.xml | 90 +++++++++++++++---- .../skins/default/xui/es/menu_pie_object.xml | 6 +- .../skins/default/xui/fr/menu_pie_object.xml | 6 +- .../skins/default/xui/it/menu_pie_object.xml | 10 ++- .../skins/default/xui/ja/menu_pie_object.xml | 14 ++- .../skins/default/xui/pl/menu_pie_object.xml | 12 ++- .../skins/default/xui/ru/menu_pie_object.xml | 10 ++- 9 files changed, 123 insertions(+), 41 deletions(-) diff --git a/indra/newview/skins/default/xui/az/menu_pie_object.xml b/indra/newview/skins/default/xui/az/menu_pie_object.xml index cacb9c7d1d..00598b3d85 100644 --- a/indra/newview/skins/default/xui/az/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/az/menu_pie_object.xml @@ -6,12 +6,14 @@ - + + + + - diff --git a/indra/newview/skins/default/xui/de/menu_pie_object.xml b/indra/newview/skins/default/xui/de/menu_pie_object.xml index 2dbb6e8975..14933a9105 100644 --- a/indra/newview/skins/default/xui/de/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/de/menu_pie_object.xml @@ -6,12 +6,18 @@ - + + + + + + + + - diff --git a/indra/newview/skins/default/xui/en/menu_pie_object.xml b/indra/newview/skins/default/xui/en/menu_pie_object.xml index c384fe9953..047fee9532 100644 --- a/indra/newview/skins/default/xui/en/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/en/menu_pie_object.xml @@ -58,15 +58,78 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - diff --git a/indra/newview/skins/default/xui/es/menu_pie_object.xml b/indra/newview/skins/default/xui/es/menu_pie_object.xml index 735648d129..6a869f014b 100644 --- a/indra/newview/skins/default/xui/es/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/es/menu_pie_object.xml @@ -6,12 +6,14 @@ - + + + + - diff --git a/indra/newview/skins/default/xui/fr/menu_pie_object.xml b/indra/newview/skins/default/xui/fr/menu_pie_object.xml index 3470749220..7f2d74931e 100644 --- a/indra/newview/skins/default/xui/fr/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_pie_object.xml @@ -6,12 +6,14 @@ - + + + + - diff --git a/indra/newview/skins/default/xui/it/menu_pie_object.xml b/indra/newview/skins/default/xui/it/menu_pie_object.xml index 0e8f06ede0..67c0efa101 100644 --- a/indra/newview/skins/default/xui/it/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/it/menu_pie_object.xml @@ -6,12 +6,18 @@ - + + + + + + + + - diff --git a/indra/newview/skins/default/xui/ja/menu_pie_object.xml b/indra/newview/skins/default/xui/ja/menu_pie_object.xml index f959fe19ac..ebdc8d9a07 100644 --- a/indra/newview/skins/default/xui/ja/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/ja/menu_pie_object.xml @@ -19,12 +19,13 @@ - + + + + + name="Pay..."/> @@ -34,9 +35,6 @@ - @@ -45,7 +43,7 @@ name="Pie Object Attach" /> + name="Return..."/> diff --git a/indra/newview/skins/default/xui/pl/menu_pie_object.xml b/indra/newview/skins/default/xui/pl/menu_pie_object.xml index 21c5f6a7d3..a6d38c6add 100644 --- a/indra/newview/skins/default/xui/pl/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/pl/menu_pie_object.xml @@ -1,17 +1,23 @@ - + - + + + + + + + + - diff --git a/indra/newview/skins/default/xui/ru/menu_pie_object.xml b/indra/newview/skins/default/xui/ru/menu_pie_object.xml index 93238bda76..93a3945585 100644 --- a/indra/newview/skins/default/xui/ru/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/ru/menu_pie_object.xml @@ -6,12 +6,18 @@ - + + + + + + + + - From df3a9f741f1114e3838a1e73d137e6fa4f3be7dd Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 20 Sep 2024 13:43:40 +0200 Subject: [PATCH 04/35] Shuffle pie menu options around to have previous take default on the same slice the cursor is on already --- .../skins/default/xui/en/menu_pie_object.xml | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/indra/newview/skins/default/xui/en/menu_pie_object.xml b/indra/newview/skins/default/xui/en/menu_pie_object.xml index 047fee9532..561937a254 100644 --- a/indra/newview/skins/default/xui/en/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/en/menu_pie_object.xml @@ -60,19 +60,22 @@ + label="Copies as separate items" + name="Take Copy Separate"> + function="Object.TakeSeparateCopy"/> + function="Tools.EnableCopySeparate"/> + function="Object.VisibleTakeMultiple"/> + + + + + + + - - - - - Date: Fri, 20 Sep 2024 13:44:23 +0200 Subject: [PATCH 05/35] Update German translation so the labels kinda fit --- indra/newview/skins/default/xui/de/menu_pie_object.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/skins/default/xui/de/menu_pie_object.xml b/indra/newview/skins/default/xui/de/menu_pie_object.xml index 14933a9105..e24f035a9c 100644 --- a/indra/newview/skins/default/xui/de/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/de/menu_pie_object.xml @@ -7,12 +7,12 @@ + - - - - + + + From 39961e357b7978144e6c481aba9fc6a776f6288f Mon Sep 17 00:00:00 2001 From: Beq Date: Fri, 20 Sep 2024 21:47:10 +0100 Subject: [PATCH 06/35] [builds] relase_type needs to be lower case. --- fsutils/download_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsutils/download_list.py b/fsutils/download_list.py index 81628ed71f..7b89ed314a 100644 --- a/fsutils/download_list.py +++ b/fsutils/download_list.py @@ -343,7 +343,7 @@ def update_fs_version_mgr(build_info, config): sys.exit(1) secret_for_api = generate_secret(secret_key) - build_type = build_info["build_type"] + build_type = build_info["build_type"].lower() version = os.environ.get('FS_VIEWER_VERSION') channel = os.environ.get('FS_VIEWER_CHANNEL') build_number = os.environ.get('FS_VIEWER_BUILD') From d4e9604700a1dbae3dbce58a3be0fda1465fd39c Mon Sep 17 00:00:00 2001 From: Beq Date: Fri, 20 Sep 2024 22:25:21 +0100 Subject: [PATCH 07/35] FIRE-34515 - Mac restore settings crash PBRTerrainDetail is not a user setting as it is critically dependent on the GPU/OpenGL capabilities, do not restore to "default" during resets. --- indra/newview/llfeaturemanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 7e9b2a8267..01e972c829 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -269,6 +269,7 @@ bool LLFeatureManager::loadFeatureTables() mSkippedFeatures.insert("RenderGamma"); mSkippedFeatures.insert("RenderVBOEnable"); mSkippedFeatures.insert("RenderFogRatio"); + mSkippedFeatures.insert("RenderTerrainPBRDetail"); // FIRE-34515 crash in restore settings on Mac // first table is install with app std::string app_path = gDirUtilp->getAppRODataDir(); From 5b74521e784ceef70cf83dae5bb08bd829648451 Mon Sep 17 00:00:00 2001 From: Beq Date: Fri, 20 Sep 2024 22:47:07 +0100 Subject: [PATCH 08/35] FIRE-34524 - Improve whitelist adviser text Updated the text in the whitelist adviser for better clarity and corrected a typo. The changes include clearer instructions on adding viewer executables to AV executable exclusions. --- indra/newview/skins/default/xui/en/floater_whitelist.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_whitelist.xml b/indra/newview/skins/default/xui/en/floater_whitelist.xml index a63c6ea1d5..0f1925c2d7 100644 --- a/indra/newview/skins/default/xui/en/floater_whitelist.xml +++ b/indra/newview/skins/default/xui/en/floater_whitelist.xml @@ -56,8 +56,8 @@ Please add these to your AV folder exclusions as shown on the above wiki page. 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. +The following box shows the names and full paths of the viewer executables. +Add the full paths to your AV executable exclusions as shown in the above wiki. Date: Sat, 21 Sep 2024 08:55:16 +0100 Subject: [PATCH 09/35] Revert "FIRE-34515 - Mac restore settings crash" This reverts commit d4e9604700a1dbae3dbce58a3be0fda1465fd39c. --- indra/newview/llfeaturemanager.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 01e972c829..7e9b2a8267 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -269,7 +269,6 @@ bool LLFeatureManager::loadFeatureTables() mSkippedFeatures.insert("RenderGamma"); mSkippedFeatures.insert("RenderVBOEnable"); mSkippedFeatures.insert("RenderFogRatio"); - mSkippedFeatures.insert("RenderTerrainPBRDetail"); // FIRE-34515 crash in restore settings on Mac // first table is install with app std::string app_path = gDirUtilp->getAppRODataDir(); From bd3040ac1a8559c560089fa3467c33a2e12d4b5b Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 21 Sep 2024 18:30:04 +0200 Subject: [PATCH 10/35] FIRE-34438 Shorten English labels in Take pie submenu a bit, sync menu options order in all languages --- indra/newview/skins/default/xui/az/menu_pie_object.xml | 2 +- indra/newview/skins/default/xui/de/menu_pie_object.xml | 2 +- indra/newview/skins/default/xui/en/menu_pie_object.xml | 8 ++++---- indra/newview/skins/default/xui/es/menu_pie_object.xml | 2 +- indra/newview/skins/default/xui/fr/menu_pie_object.xml | 2 +- indra/newview/skins/default/xui/it/menu_pie_object.xml | 4 ++-- indra/newview/skins/default/xui/ja/menu_pie_object.xml | 2 +- indra/newview/skins/default/xui/pl/menu_pie_object.xml | 6 +++--- indra/newview/skins/default/xui/ru/menu_pie_object.xml | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/indra/newview/skins/default/xui/az/menu_pie_object.xml b/indra/newview/skins/default/xui/az/menu_pie_object.xml index 00598b3d85..6893e78964 100644 --- a/indra/newview/skins/default/xui/az/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/az/menu_pie_object.xml @@ -7,8 +7,8 @@ - + diff --git a/indra/newview/skins/default/xui/de/menu_pie_object.xml b/indra/newview/skins/default/xui/de/menu_pie_object.xml index e24f035a9c..305e989e7b 100644 --- a/indra/newview/skins/default/xui/de/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/de/menu_pie_object.xml @@ -8,8 +8,8 @@ - + diff --git a/indra/newview/skins/default/xui/en/menu_pie_object.xml b/indra/newview/skins/default/xui/en/menu_pie_object.xml index 561937a254..05cb25a846 100644 --- a/indra/newview/skins/default/xui/en/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/en/menu_pie_object.xml @@ -65,7 +65,7 @@ name="Take Submenu"> @@ -100,7 +100,7 @@ @@ -111,7 +111,7 @@ @@ -122,7 +122,7 @@ diff --git a/indra/newview/skins/default/xui/es/menu_pie_object.xml b/indra/newview/skins/default/xui/es/menu_pie_object.xml index 6a869f014b..ce6cae3d85 100644 --- a/indra/newview/skins/default/xui/es/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/es/menu_pie_object.xml @@ -7,8 +7,8 @@ - + diff --git a/indra/newview/skins/default/xui/fr/menu_pie_object.xml b/indra/newview/skins/default/xui/fr/menu_pie_object.xml index 7f2d74931e..83e97d5fd8 100644 --- a/indra/newview/skins/default/xui/fr/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_pie_object.xml @@ -7,8 +7,8 @@ - + diff --git a/indra/newview/skins/default/xui/it/menu_pie_object.xml b/indra/newview/skins/default/xui/it/menu_pie_object.xml index 67c0efa101..d403653aeb 100644 --- a/indra/newview/skins/default/xui/it/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/it/menu_pie_object.xml @@ -7,12 +7,12 @@ - + + - diff --git a/indra/newview/skins/default/xui/ja/menu_pie_object.xml b/indra/newview/skins/default/xui/ja/menu_pie_object.xml index ebdc8d9a07..e9b48444e1 100644 --- a/indra/newview/skins/default/xui/ja/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/ja/menu_pie_object.xml @@ -20,8 +20,8 @@ label="購入" name="Buy..."/> - + - + - + + - diff --git a/indra/newview/skins/default/xui/ru/menu_pie_object.xml b/indra/newview/skins/default/xui/ru/menu_pie_object.xml index 93a3945585..e55d149c11 100644 --- a/indra/newview/skins/default/xui/ru/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/ru/menu_pie_object.xml @@ -7,12 +7,12 @@ - + + - From f33733d3b6000b0eaacdd32206235ccce38036a0 Mon Sep 17 00:00:00 2001 From: Beq Date: Sat, 21 Sep 2024 13:39:12 +0100 Subject: [PATCH 11/35] FIRE-34515 - Updated settings restoration process Added a step in the settings restoration process to apply recommended settings after resetting to defaults. This ensures that any necessary default configurations are properly set up before restoring user-specific global settings from backup. --- indra/newview/llfloaterpreference.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 1f2d603de3..cf036eea49 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -5680,6 +5680,7 @@ void FSPanelPreferenceBackup:: doRestoreSettings(const LLSD& notification, const // start clean LL_INFOS("SettingsBackup") << "clearing global settings" << LL_ENDL; gSavedSettings.resetToDefaults(); + LLFeatureManager::getInstance()->applyRecommendedSettings(); // run restore on global controls LL_INFOS("SettingsBackup") << "restoring global settings from backup" << LL_ENDL; From 2238605a4d3ba69b09889aa0732ce1867d2a7e73 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sun, 22 Sep 2024 02:54:54 +0200 Subject: [PATCH 12/35] FIRE-34531 French translation update, by Laurent Bechir --- .../default/xui/fr/floater_region_restart_schedule.xml | 2 +- .../newview/skins/default/xui/fr/floater_whitelist.xml | 4 ++-- indra/newview/skins/default/xui/fr/menu_object.xml | 10 ++++++++-- indra/newview/skins/default/xui/fr/menu_pie_object.xml | 6 +++++- .../skins/default/xui/fr/panel_region_general.xml | 1 + 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/indra/newview/skins/default/xui/fr/floater_region_restart_schedule.xml b/indra/newview/skins/default/xui/fr/floater_region_restart_schedule.xml index 8f1fe4dfea..96806a19c2 100644 --- a/indra/newview/skins/default/xui/fr/floater_region_restart_schedule.xml +++ b/indra/newview/skins/default/xui/fr/floater_region_restart_schedule.xml @@ -1,5 +1,5 @@ - + Redémarrer la région ces jours-ci : diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist.xml b/indra/newview/skins/default/xui/fr/floater_whitelist.xml index 43c7cbe09f..f14e2a0991 100644 --- a/indra/newview/skins/default/xui/fr/floater_whitelist.xml +++ b/indra/newview/skins/default/xui/fr/floater_whitelist.xml @@ -11,7 +11,7 @@ Pour vous simplifier la tâche, l'encadré ci-dessous indique les dossiers utili Veuillez les ajouter à vos exclusions de dossiers AV, comme indiqué sur la page wiki ci-dessus. -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. +La case suivante indique les noms et chemins d'accès complets des exécutables de la visionneuse. +Ajoutez les chemins d'accès complet à vos exclusions d'exécutables AV comme indiqué dans le wiki ci-dessus. \ No newline at end of file diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 78fee2306e..5d498062d0 100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml @@ -38,8 +38,14 @@ - - + + + + + + + + diff --git a/indra/newview/skins/default/xui/fr/menu_pie_object.xml b/indra/newview/skins/default/xui/fr/menu_pie_object.xml index 83e97d5fd8..c053ac8812 100644 --- a/indra/newview/skins/default/xui/fr/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_pie_object.xml @@ -7,8 +7,12 @@ - + + + + + diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml index 08f50f5511..0dc7654f1a 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml @@ -34,4 +34,5 @@