summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-08-26 12:57:16 -0700
committerRichard Nelson <richard@lindenlab.com>2011-08-26 12:57:16 -0700
commit863d9bdc501139e668da37b7242d165f76fd2399 (patch)
tree3658ba826e47f8fa3616a5b09ede040e4bdeb02c
parentaff45cf5bf655d73f50e2f5f65ac2dfbe0d732a0 (diff)
EXP-1160 FIX Cannot drag/drop items from inventory into the contents of a prim in latest Mesh build 239475
brought back some old logic for dispatching to child folder as drag and drop fallback
-rw-r--r--indra/newview/llfolderview.cpp15
1 files changed, 13 insertions, 2 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)