diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-07-08 16:07:56 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-07-08 16:07:56 -0700 |
| commit | 85ddc48e089b8c0b64ca8c224d0cbf1e1509a9c3 (patch) | |
| tree | da8ef2480a6289edf1b505ce91f2a8490bc5c1f5 /indra/newview/llfolderview.cpp | |
| parent | d7318bf9f07c1b043a9b4f50ce38b78eb3985e36 (diff) | |
| parent | 4f5f1592325fc7b757932d4c44a0581446005506 (diff) | |
merge
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 9691a53673..7581fa91c5 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1920,8 +1920,15 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, // by the folder which is the hierarchy root. if (!handled && !hasVisibleChildren()) { + if (mFolders.empty()) + { + handled = handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg); + } + else + { handled = mFolders.front()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg); } + } if (handled) { |