diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 10:55:48 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 10:55:48 -0700 |
| commit | 1c7b1532e994f8c4d1c69e419e34f07c1a9ee918 (patch) | |
| tree | ff5b60dbc6887a7a7420728a06804fa268720211 /indra/newview/lltooldraganddrop.cpp | |
| parent | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff) | |
| parent | 78821c51a1f7d5fcc6e4a2678bfd3446ccfaee36 (diff) | |
Merge from viewer-experience
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 14f17e8917..d5a99cefb2 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1652,6 +1652,13 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv( return ACCEPT_NO; } + const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false); + if(gInventory.isObjectDescendentOf(item->getUUID(), outbox_id)) + { + return ACCEPT_NO; + } + + if( drop ) { if(mSource == SOURCE_LIBRARY) @@ -2055,6 +2062,12 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory( return ACCEPT_NO; } + const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false);
+ if(gInventory.isObjectDescendentOf(category->getUUID(), outbox_id))
+ {
+ return ACCEPT_NO;
+ } + if(drop) { BOOL append = ( (mask & MASK_SHIFT) ? TRUE : FALSE ); |