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/newview/lltooldraganddrop.cpp') 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 From a0a4a3de9bbd2740b8160882ed96075c3400e555 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Tue, 23 Aug 2011 14:40:51 -0700 Subject: EXP-1068 Disallow marketplace listing of items that are currently being worn --- indra/newview/lltooldraganddrop.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/lltooldraganddrop.cpp') diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index a06cb838cf..d5a99cefb2 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -2062,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 ); -- cgit v1.2.3 From 1c57963673193d5a3da638848c0540a5fbc91603 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 12 Sep 2011 11:30:24 -0700 Subject: Removed windows line endings to conform to coding policy. --- indra/newview/lltooldraganddrop.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/lltooldraganddrop.cpp') diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index d5a99cefb2..3e5ce427a8 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -2062,10 +2062,10 @@ 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; + const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false); + if(gInventory.isObjectDescendentOf(category->getUUID(), outbox_id)) + { + return ACCEPT_NO; } if(drop) -- cgit v1.2.3