diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 21:53:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-05 21:53:31 +0200 |
| commit | aa52c852d600aa6b2ea17cdd86f53972c95cca4a (patch) | |
| tree | 757f3a3446e8f55e1cc073f1b3ab54d8e5af1b65 /indra/newview/llinventorybridge.cpp | |
| parent | edb2fb57f8782f966c7ea675d2e4c0135352ef02 (diff) | |
| parent | 2a849259223a2d3fabafc118d711e73fa7fd604f (diff) | |
Merge pull request #734 from secondlife/DRTVWR-594-maint-Y
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 932a0316dd..f806614e29 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 @@ -2810,7 +2813,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; |