From 3ecdc24bfb55319a81f34668d800ca78aca36252 Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Wed, 15 Dec 2021 20:45:49 +0100
Subject: [PATCH] FIRE-11512 - Fix accelerator keys sometimes typing things
 into text entry fields on Linux

---
 indra/llwindow/llwindowsdl.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index c6c9eff376..b84d74a244 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -1790,7 +1790,9 @@ void LLWindowSDL::gatherInput()
 		    if (SDLCheckGrabbyKeys(event.key.keysym.sym, TRUE) != 0)
 			    SDLReallyCaptureInput(TRUE);
 
-		    if (event.key.keysym.unicode)
+			// <FS:Zi> FIRE-11512 - Fix accelerator keys sometimes typing things into text entry fields, like alt+h, ctrl+shift+1 ...
+		    // if (event.key.keysym.unicode)
+		    if ((gKeyboard->currentMask(false) & (MASK_ALT | MASK_CONTROL)) == 0 && event.key.keysym.unicode)
 		    {
 			    handleUnicodeUTF16(event.key.keysym.unicode,
 					       gKeyboard->currentMask(FALSE));