diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-03 13:58:08 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-03 13:58:08 -0500 |
| commit | 5884c2fa4c01a959edaf68a4197c9d1913899d17 (patch) | |
| tree | 7a4655dca8853649cd509d17788b84c2be35617d /indra/newview/llinventorybridge.cpp | |
| parent | e299bea7e92dadbda09fb33339a04000e679aa2e (diff) | |
EXT-2131 : object properties sidepanel
EXT-2128 : remove multi-properties ability, disable from inventory menu
Also includes llsidepanelinventory cleanup.
--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) |