From 570b0d3c5b0ca5dd6e19db6837ab0da6cc7e593e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Fri, 17 Jan 2020 17:17:58 -0500 Subject: [PATCH] [VMM] Make the marketplace panel a dropzone, drag and drop anywhere~ Fixes Deltek's issue with not being able to drop in the zone nor in the empty space where there are not folders in the listings --- indra/newview/llfloatermarketplacelistings.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp index 7081aa5bc..fcd674328 100644 --- a/indra/newview/llfloatermarketplacelistings.cpp +++ b/indra/newview/llfloatermarketplacelistings.cpp @@ -94,14 +94,13 @@ BOOL LLPanelMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL std::string& tooltip_msg) { LLView * handled_view = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); - BOOL handled = (handled_view != NULL); - // Special case the drop zone - if (handled && (handled_view->getName() == "marketplace_drop_zone")) + // Special case the drop zone, also we're a giant drop zone + if (!handled_view || (handled_view->getName() == "marketplace_drop_zone")) { LLFolderView* root_folder = getRootFolder(); - handled = root_folder->handleDragAndDropToThisFolder(mask, drop, cargo_type, cargo_data, accept, tooltip_msg); + return root_folder->handleDragAndDropToThisFolder(mask, drop, cargo_type, cargo_data, accept, tooltip_msg); } - return handled; + return false; } void LLPanelMarketplaceListings::buildAllPanels()