From a0a4a3de9bbd2740b8160882ed96075c3400e555 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
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