From 5ae4be708ab0c87ca08b6f182a8051949ae5d3f0 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 16 Aug 2020 22:49:26 +0200
Subject: [PATCH] FIRE-30003: (CTRL-)F10 can't be used as gesture trigger

---
 indra/llui/llmenugl.cpp | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 7ff3fac205..c7f82dca0d 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3382,25 +3382,27 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask)
 		mAltKeyTrigger = FALSE;
 	}
 
-	if(!result 
-		&& (key == KEY_F10 && mask == MASK_CONTROL) 
-		&& !gKeyboard->getKeyRepeated(key)
-		&& isInVisibleChain())
-	{
-		if (getHighlightedItem())
-		{
-			clearHoverItem();
-			LLMenuGL::setKeyboardMode(FALSE);
-		}
-		else
-		{
-			// close menus originating from other menu bars when first opening menu via keyboard
-			LLMenuGL::sMenuContainer->hideMenus();
-			highlightNextItem(NULL);
-			LLMenuGL::setKeyboardMode(TRUE);
-		}
-		return TRUE;
-	}
+	// <FS:Ansariel> FIRE-30003: (CTRL-)F10 can't be used as gesture trigger
+	//if(!result 
+	//	&& (key == KEY_F10 && mask == MASK_CONTROL) 
+	//	&& !gKeyboard->getKeyRepeated(key)
+	//	&& isInVisibleChain())
+	//{
+	//	if (getHighlightedItem())
+	//	{
+	//		clearHoverItem();
+	//		LLMenuGL::setKeyboardMode(FALSE);
+	//	}
+	//	else
+	//	{
+	//		// close menus originating from other menu bars when first opening menu via keyboard
+	//		LLMenuGL::sMenuContainer->hideMenus();
+	//		highlightNextItem(NULL);
+	//		LLMenuGL::setKeyboardMode(TRUE);
+	//	}
+	//	return TRUE;
+	//}
+	// </FS:Ansariel>
 
 	if (result && !getHighlightedItem() && LLMenuGL::sMenuContainer->hasVisibleMenu())
 	{