DD-117 : Prevent drag and drop of linked items into the marketplace

1 files changed, 2 insertions, 2 deletions

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;