diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-05-28 18:38:01 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-05-28 18:38:01 +0300 |
| commit | 353afb48f265822f591eb8d02cacd830e32640bf (patch) | |
| tree | f138906189f7f7adefb812137a991366f342b6ce /indra/newview/llinventorybridge.cpp | |
| parent | 5a44656a2687de2f495708134308228d28a69971 (diff) | |
SL-13239 Add 'Touch' to the various attachment context menus
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index bb7f219ed9..c6b972ada2 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6385,6 +6385,10 @@ void LLObjectBridge::performAction(LLInventoryModel* model, std::string action) { LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, false); // Don't replace if adding. } + else if ("touch" == action) + { + handle_attachment_touch(mUUID); + } else if ("edit" == action) { handle_attachment_edit(mUUID); @@ -6540,6 +6544,12 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { items.push_back(std::string("Wearable And Object Separator")); + items.push_back(std::string("Attachment Touch")); + if ( ((flags & FIRST_SELECTED_ITEM) == 0) || !enable_attachment_touch(mUUID) ) + { + disabled_items.push_back(std::string("Attachment Touch")); + } + items.push_back(std::string("Wearable Edit")); if ( ((flags & FIRST_SELECTED_ITEM) == 0) || !get_is_item_editable(mUUID) ) { |