diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-12 14:52:18 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-12 14:52:18 -0400 |
| commit | e26bd6c140c24d72b44966127825fef5bbe47c1d (patch) | |
| tree | c70214a7a7e898b528f6b0f3ec6d47992969fe97 /indra/newview/lltooldraganddrop.cpp | |
| parent | 08b75949998adbe3bbb4ef1d1d7e49405e468c94 (diff) | |
| parent | 1c57963673193d5a3da638848c0540a5fbc91603 (diff) | |
merge changes for storm-1593 (marketplace inbox)
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..3e5ce427a8 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 ); |