From d079c11c99c381a3e9aae292e132c67f39d038ff Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Mon, 6 Nov 2023 15:28:26 +0200 Subject: SL-20565 Places floater -- allow dragging a folder into a folder (#491) --- indra/newview/llinventorybridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorybridge.cpp') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 73005d6903..fddf5179fa 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2796,7 +2796,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, is_movable = can_move_folder_to_marketplace(master_folder, dest_folder, inv_cat, tooltip_msg, bundle_size); } - if (is_movable) + if (is_movable && !move_is_into_landmarks) { LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE); is_movable = active_panel != NULL; -- cgit v1.2.3 From 728a91b288c88131db032db687a3e6f0e0a09301 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 29 Nov 2023 22:33:59 +0200 Subject: SL-20181 Use back-of compatible fetch If fetch failed for some reason, old version would cause excessive rerequests. --- indra/newview/llinventorybridge.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/llinventorybridge.cpp') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index de987d2dbd..ff92af32ff 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2284,8 +2284,11 @@ BOOL LLFolderBridge::isItemMovable() const void LLFolderBridge::selectItem() { - // Have no fear: the first thing start() does is to test if everything for that folder has been fetched... - LLInventoryModelBackgroundFetch::instance().start(getUUID(), true); + LLViewerInventoryCategory* cat = gInventory.getCategory(getUUID()); + if (cat) + { + cat->fetch(); + } } void LLFolderBridge::buildDisplayName() const -- cgit v1.2.3