diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 14:21:46 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 14:21:46 -0400 |
| commit | b8b596a5fe9de11cc43294e967e474942fa74035 (patch) | |
| tree | 008a93937e8b37f87b0ead2a04ecb509e2056176 /indra | |
| parent | a5e0bbab4a151e52aa1fa1024820c6e6402bc30a (diff) | |
| parent | 5a6f07ab6425a8f0f4b3563800333b8cb3209cbf (diff) | |
merged fix for EXP-1160 (STORM-1575)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 15 | ||||
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 6461a5525e..ec162e00eb 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1912,9 +1912,20 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, // when drop is not handled by child, it should be handled // by the folder which is the hierarchy root. - if (!handled && getListener()->getUUID().notNull()) + if (!handled) { - LLFolderViewFolder::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); + if (getListener()->getUUID().notNull()) + { + LLFolderViewFolder::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); + } + else + { + if (!mFolders.empty()) + { + // dispatch to last folder as a hack to support "Contents" folder in object inventory + handled = mFolders.back()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg); + } + } } if (handled) diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index b20f89aa7c..f00d6087f9 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -568,7 +568,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia else { requested_options.append("basic-mode"); - requested_options.append("inventory-basic"); + //requested_options.append("inventory-basic"); } #endif |