diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-08-14 21:02:43 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-08-14 21:02:43 -0700 |
| commit | 9bedc2ab3dc88e2958a31d8501c3291cb2d5d20e (patch) | |
| tree | 41dcdfbcbeea057fb4ee035a16a2d657d120c573 /indra | |
| parent | f02ac3b7dc8c0496a639e881f6a5f8c62bbdd7c0 (diff) | |
DD-117 : Prevent drag and drop of linked items into the marketplace
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 4 |
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; |