From 724cd694fab6a2a9e2c7df18b6367755ddd88c67 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 24 Nov 2017 16:36:57 +0100 Subject: [PATCH] FIRE-5913: Selecting a mix of active and inactive gestures disables both "Activate" / "Deactivate" menu options --- indra/newview/llinventorybridge.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index d5086817ad..23f2df256c 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6481,6 +6481,15 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags) getClipboardEntries(true, items, disabled_items, flags); items.push_back(std::string("Gesture Separator")); + // FIRE-5913: Selecting a mix of active and inactive gestures disables both "Activate" / "Deactivate" menu options + if (flags & ITEM_IN_MULTI_SELECTION) + { + items.push_back(std::string("Deactivate")); + items.push_back(std::string("Activate")); + } + else + { + // if (LLGestureMgr::instance().isGestureActive(getUUID())) { items.push_back(std::string("Deactivate")); @@ -6489,6 +6498,9 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { items.push_back(std::string("Activate")); } + // FIRE-5913: Selecting a mix of active and inactive gestures disables both "Activate" / "Deactivate" menu options + } + // } addLinkReplaceMenuOption(items, disabled_items);