diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-08-18 11:04:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-08-18 11:04:07 -0700 |
| commit | 6d7523defcc5a78e8db9e4ea9db6605247c289ae (patch) | |
| tree | f5e43bf3e55cce0d983de514c8cecb25de3d4129 /indra | |
| parent | 3676469b72a3f677e2048b5117e4a81897244dc7 (diff) | |
EXP-1068 Disallow dragging of outbox items onto avatar
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 14f17e8917..a06cb838cf 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) |