livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-5913: Selecting a mix of active and inactive gestures disables both "Activate" / "Deactivate" menu options

Ansariel 2017-11-24 16:36:57 +01:00
parent 29b9951a94
commit 724cd694fa
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llinventorybridge.cpp
View File

@ -6481,6 +6481,15 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
getClipboardEntries(true, items, disabled_items, flags);
items.push_back(std::string("Gesture Separator"));
// <FS:Ansariel> 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
{
// </FS:Ansariel>
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"));
}
// <FS:Ansariel> FIRE-5913: Selecting a mix of active and inactive gestures disables both "Activate" / "Deactivate" menu options
}
// </FS:Ansariel>
}
addLinkReplaceMenuOption(items, disabled_items);