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/llfolderview.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/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 9cca1b07db..474d2ca21f 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1822,6 +1822,13 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, BOOL handled = LLView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); + // When there are no visible children drag and drop is handled + // by the folder which is the hierarchy root. + if (!handled && !hasVisibleChildren()) + { + handled = mFolders.front()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg); + } + if (handled) { lldebugst(LLERR_USER_INPUT) << "dragAndDrop handled by LLFolderView" << llendl; |