diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-03 14:02:02 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-03 14:02:02 -0500 |
commit | 0dd9871012f50d6201217a79b65bedd28368efae (patch) | |
tree | c378c6777683b61a9f057fda0e556cc2f4068b2f /indra/newview/llinventorybridge.cpp | |
parent | 73573688c550c8a1e9ab4822d92f33f3523778af (diff) | |
parent | 5884c2fa4c01a959edaf68a4197c9d1913899d17 (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 336025e55e..b9775cf0e9 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -604,6 +604,12 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, { disabled_items.push_back(std::string("Delete")); } + + // If multiple items are selected, disable properties (if it exists). + if ((flags & FIRST_SELECTED_ITEM) == 0) + { + disabled_items.push_back(std::string("Properties")); + } } void LLInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags) |