From 9bedc2ab3dc88e2958a31d8501c3291cb2d5d20e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 14 Aug 2014 21:02:43 -0700 Subject: DD-117 : Prevent drag and drop of linked items into the marketplace --- indra/newview/llinventoryfunctions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index bdd129d54c..98f74bb1a6 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -923,8 +923,8 @@ bool can_move_to_marketplace(LLInventoryItem* inv_item, std::string& tooltip_msg LLViewerInventoryItem * linked_item = viewer_inv_item->getLinkedItem(); LLViewerInventoryCategory * linked_category = viewer_inv_item->getLinkedCategory(); - // Linked items and folders cannot be put for sale if caller can't resolve them - if (!resolve_links && (linked_category || linked_item)) + // Linked items and folders cannot be put for sale + if (linked_category || linked_item) { tooltip_msg = LLTrans::getString("TooltipOutboxLinked"); return false; -- cgit v1.2.3