From 6d7523defcc5a78e8db9e4ea9db6605247c289ae Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 18 Aug 2011 11:04:07 -0700 Subject: EXP-1068 Disallow dragging of outbox items onto avatar --- indra/newview/lltooldraganddrop.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra') 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) -- cgit v1.2.3