diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-05 13:38:52 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-05 13:38:52 -0500 |
| commit | 663aa828312413a391a2d848f6bb1b9aae92a543 (patch) | |
| tree | f0289e1fabb9ce7e316367d24a01d0faca6ffcf2 /indra/newview | |
| parent | fc9099a0faef9f077b7986651f953998d6b9ac0c (diff) | |
EXT-4618 : Pasting an item into the COF folder creates a copy of the item, not a link
EXT-5018 : Automatically reject leading separators from right click menu
Trivial fix to remove "paste" as an option from the COF.
Also contains a partial fix for EXT-5018.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 19fbd7ade1..c024304f26 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -470,7 +470,9 @@ void hide_context_entries(LLMenuGL& menu, { const LLView::child_list_t *list = menu.getChildList(); - BOOL is_previous_entry_separator = FALSE; + // For removing double separators or leading separator. Start at true so that + // if the first element is a separator, it will not be shown. + BOOL is_previous_entry_separator = TRUE; LLView::child_list_t::const_iterator itor; for (itor = list->begin(); itor != list->end(); ++itor) @@ -582,8 +584,12 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, } } - items.push_back(std::string("Paste")); - if (!isClipboardPasteable() || (flags & FIRST_SELECTED_ITEM) == 0) + // Don't allow items to be pasted directly into the COF. + if (!isCOFFolder()) + { + items.push_back(std::string("Paste")); + } + if (!isClipboardPasteable() || ((flags & FIRST_SELECTED_ITEM) == 0)) { disabled_items.push_back(std::string("Paste")); } |