diff options
author | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-23 18:35:27 +0200 |
---|---|---|
committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-23 18:35:27 +0200 |
commit | 425fd9c6e0f68630191078a34a05bed518156efb (patch) | |
tree | 18f98bc84082213a503ff84e3fcb7262b43a77e8 /indra/newview/llinventorypanel.cpp | |
parent | 40b8a7a3284daa90d3b0e278e8afb5b80b544d0d (diff) |
Fixed normal bug EXT-3299 "Can't drag and drop landmarks into an empty favorites folder through landmarksSP"
- Added drag and drop for empty inventory panel. Dropped item gets to
the root folder.
- Fixed issue with empty "Landmarks" inventory panel not displaying "No
matching items..." message.
- Removed accordion updating and hiding in idle routine. This invalidates EXT-2346 "My Landmarks accordion panels shouldn't be displayed if there are no landmarks in respective folders"
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r-- | indra/newview/llinventorypanel.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 082b7a9468..164e72e621 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -628,9 +628,15 @@ BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EAcceptance* accept, std::string& tooltip_msg) { - BOOL handled = LLPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); + // If folder view is empty the (x, y) point won't be in its rect + // so the handler must be called explicitly. + if (!mFolders->hasVisibleChildren()) + { + handled = mFolders->handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); + } + if (handled) { mFolders->setDragAndDropThisFrame(); |