diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-20 21:40:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-20 21:40:48 -0700 |
| commit | 8193caa7939643d1080ceb9463b3e3978b0f516a (patch) | |
| tree | e22b332b5a0227b93d35c02d491a168faea0b48b /indra/newview/llinventorybridge.cpp | |
| parent | 23acc30e2709dac1aa54eecda5c1bc6b2b226b5b (diff) | |
DD-88 : Make Drag and Drop tooltips for Merchant Outbox and Marketplace restrictions identical
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index c9efb92acc..83403c53f5 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -83,7 +83,6 @@ void copy_slurl_to_clipboard_callback_inv(const std::string& slurl); // Marketplace outbox current disabled #define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1 #define ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU 0 -#define BLOCK_WORN_ITEMS_IN_OUTBOX 1 typedef std::pair<LLUUID, LLUUID> two_uuids_t; typedef std::list<two_uuids_t> two_uuids_list_t; @@ -2361,14 +2360,12 @@ static BOOL can_move_to_marketplace(LLInventoryItem* inv_item, std::string& tool return false; } -#if BLOCK_WORN_ITEMS_IN_OUTBOX bool worn = get_is_item_worn(inv_item->getUUID()); if (worn) { tooltip_msg = LLTrans::getString("TooltipOutboxWorn"); return false; } -#endif bool calling_card = (LLAssetType::AT_CALLINGCARD == inv_item->getType()); if (calling_card) |