diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-04-09 11:55:25 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-04-09 11:55:25 +0300 |
| commit | 9eb4caf0a11116f131f25aa40d92d0ab959cbcbf (patch) | |
| tree | a02ac1a687bb254da2023ef3c2848a6b186e44f0 /indra | |
| parent | 5c797555b3293f0fac20ae5ba27a2bfd6c732215 (diff) | |
Fixed normal bug EXT-6746 (Duplicated landmarks appear in 'Favorites bar' folder if DnD them from 'My Landmarks' folder)
Reason: LLFolderView::handleDragAndDrop got called twice from LLInventoryPanel::handleDragAndDrop when drag into empty Inventory folder view.
Fix: check if drag and drop is already handled before passing the event directly to LLFolderView.
Reviewed by Richard at https://codereview.productengine.com/secondlife/r/201/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index c6c2d23a4b..92f795462b 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -669,7 +669,8 @@ BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, // If folder view is empty the (x, y) point won't be in its rect // so the handler must be called explicitly. - if (!mFolderRoot->hasVisibleChildren()) + // but only if was not handled before. See EXT-6746. + if (!handled && !mFolderRoot->hasVisibleChildren()) { handled = mFolderRoot->handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); } |