From e145a829bb2099e4c40342cf4c7a15cd9344c56f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Sat, 11 Feb 2023 04:16:22 +0200 Subject: [PATCH 1/4] SL-19203 Change default link color from green to blue --- indra/newview/skins/default/colors.xml | 2 +- indra/newview/skins/default/xui/en/floater_snapshot.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 8bb3feaeb0..87ccccbff0 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -407,7 +407,7 @@ value="0.43 0.06 0.06 1" /> + value="0.3 0.82 1 1" /> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index f441e3cbd7..fcd24d83bb 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -440,7 +440,7 @@ length="1" halign="right" name="360_label" - text_color="0.3 0.82 1 1" + text_color="HTMLLinkColor" top_delta="0" type="string" width="115"> From c5a3c97b6b3a65a4f0c34e74db925f8ed71c8109 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 14 Feb 2023 00:40:01 +0100 Subject: [PATCH 2/4] Add multi item properties floater support --- indra/newview/llfloatermarketplacelistings.cpp | 16 ++++++++++++++++ indra/newview/llfloatermarketplacelistings.h | 7 +++++++ indra/newview/llinventoryfunctions.cpp | 10 ++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp index 56cdd3446f..58bd4bc82b 100644 --- a/indra/newview/llfloatermarketplacelistings.cpp +++ b/indra/newview/llfloatermarketplacelistings.cpp @@ -45,6 +45,7 @@ #include "lltabcontainer.h" #include "lltextbox.h" #include "lltrans.h" +#include "llviewerwindow.h" ///---------------------------------------------------------------------------- /// LLPanelMarketplaceListings @@ -982,3 +983,18 @@ void LLFloaterItemProperties::onOpen(const LLSD& key) } } +LLMultiItemProperties::LLMultiItemProperties(const LLSD& key) + : LLMultiFloater(LLSD()) +{ + // start with a small rect in the top-left corner ; will get resized + LLRect rect; + rect.setLeftTopAndSize(0, gViewerWindow->getWindowHeightScaled(), 350, 350); + setRect(rect); + LLFloater* last_floater = LLFloaterReg::getLastFloaterInGroup(key.asString()); + if (last_floater) + { + stackWith(*last_floater); + } + setTitle(LLTrans::getString("MultiPropertiesTitle")); + buildTabContainer(); +} diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h index ffc098e28a..77e855fd2a 100644 --- a/indra/newview/llfloatermarketplacelistings.h +++ b/indra/newview/llfloatermarketplacelistings.h @@ -33,6 +33,7 @@ #include "llinventorypanel.h" #include "llnotificationptr.h" #include "llmodaldialog.h" +#include "llmultifloater.h" #include "lltexteditor.h" class LLInventoryCategoriesObserver; @@ -223,4 +224,10 @@ public: private: }; +class LLMultiItemProperties : public LLMultiFloater +{ +public: + LLMultiItemProperties(const LLSD& key); +}; + #endif // LL_LLFLOATERMARKETPLACELISTINGS_H diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index c3c8945556..38f79620bb 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -2561,6 +2561,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root LLMultiPreview* multi_previewp = NULL; + LLMultiItemProperties* multi_itempropertiesp = nullptr; if (("task_open" == action || "open" == action) && selected_items.size() > 1) { @@ -2594,8 +2595,9 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root } else if (("task_properties" == action || "properties" == action) && selected_items.size() > 1) { - // Isn't supported (previously used LLMultiProperties) - LL_WARNS() << "Tried to open properties for multiple items" << LL_ENDL; + multi_itempropertiesp = new LLMultiItemProperties("item_properties"); + gFloaterView->addChild(multi_itempropertiesp); + LLFloater::setFloaterHost(multi_itempropertiesp); } std::set selected_uuid_set = LLAvatarActions::getInventorySelectedUUIDs(); @@ -2768,6 +2770,10 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root { multi_previewp->openFloater(LLSD()); } + else if (multi_itempropertiesp) + { + multi_itempropertiesp->openFloater(LLSD()); + } } void LLInventoryAction::saveMultipleTextures(const std::vector& filenames, std::set selected_items, LLInventoryModel* model) From 90b272680e5e8d9781e135a07aa36f39a8427206 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 14 Feb 2023 01:00:17 +0100 Subject: [PATCH 3/4] Re-enable properties menu option for inventory multi-selections --- indra/newview/llinventorybridge.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 2dd5d12ee6..81db0c45c2 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -921,12 +921,6 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, addDeleteContextMenuOptions(items, disabled_items); - // If multiple items are selected, disable properties (if it exists). - if ((flags & FIRST_SELECTED_ITEM) == 0) - { - disabled_items.push_back(std::string("Properties")); - } - LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE); if (active_panel && (active_panel->getName() != "All Items")) { From 4bc9331dddbacb9c0c36252b32f2514b9080dcf5 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 14 Feb 2023 18:04:46 +0200 Subject: [PATCH 4/4] SL-19140 Fix contribution doc --- doc/contributions.txt | 1 + indra/newview/llinventoryfunctions.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/contributions.txt b/doc/contributions.txt index cc988b98aa..555bfecd95 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -237,6 +237,7 @@ Ansariel Hiller SL-15227 SL-15398 SL-18432 + SL-19140 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 38f79620bb..5e5be39c0c 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -49,6 +49,7 @@ #include "llclipboard.h" #include "lldirpicker.h" #include "lldonotdisturbnotificationstorage.h" +#include "llfloatermarketplacelistings.h" #include "llfloatersidepanelcontainer.h" #include "llfocusmgr.h" #include "llfolderview.h"