diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-19 14:50:08 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-19 14:50:08 -0400 |
| commit | 5b7b3cbbbbec439880a33af8944d10c7bb527c3a (patch) | |
| tree | 3e37afeba3e2bb67f53327719de72b4506d2605e /indra/newview/lltooldraganddrop.cpp | |
| parent | c7dd3aac83eb9bde5fe0febaebcd998847bf1889 (diff) | |
| parent | 2fba01d160716b886a7dfc0c86abda767a25d23f (diff) | |
Merge
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 ); |