From c380f1f3994f8e6cd2a0ad2ea0505779a88eb07f Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Sun, 16 Dec 2012 15:22:58 -0500 Subject: [PATCH] Don't show Paste As Link when Paste As Copy is shown enabled because it'll just be disabled in these cases. --- indra/newview/llinventorybridge.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 63bb8426a..d7f81a3b7 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -854,21 +854,26 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, } } + bool paste_as_copy = false; // If Paste As Copy is on the menu, Paste As Link will always show up disabled, so don't bother. // Don't allow items to be pasted directly into the COF or the inbox/outbox if (!isCOFFolder() && !isInboxFolder() && !isOutboxFolder()) { items.push_back(std::string("Paste")); // Paste as copy if we have links. if (InventoryLinksEnabled() && isClipboardPasteableAsCopy()) + { items.push_back(std::string("Paste As Copy")); + paste_as_copy = true; + } } if (!isClipboardPasteable() || ((flags & FIRST_SELECTED_ITEM) == 0)) { disabled_items.push_back(std::string("Paste")); disabled_items.push_back(std::string("Paste As Copy")); + paste_as_copy = false; } - if(InventoryLinksEnabled()) + if (!paste_as_copy && InventoryLinksEnabled()) { items.push_back(std::string("Paste As Link")); if (!isClipboardPasteableAsLink() || (flags & FIRST_SELECTED_ITEM) == 0)