From 28b82cb645e76adadc3dfcd905c84986653e5d2b Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Fri, 29 Jul 2022 13:35:18 +0200 Subject: [PATCH] Linux SDL2 - Fix main enter/return key not working when capslock or numlock are engaged --- indra/llwindow/llwindowsdl2.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/llwindow/llwindowsdl2.cpp b/indra/llwindow/llwindowsdl2.cpp index b19ed9cab2..0651206901 100644 --- a/indra/llwindow/llwindowsdl2.cpp +++ b/indra/llwindow/llwindowsdl2.cpp @@ -1798,7 +1798,11 @@ void LLWindowSDL::gatherInput() // invoke handleUnicodeUTF16 in case the user hits return. // Note that we cannot blindly use handleUnicodeUTF16 for each SDL_KEYDOWN. Doing so will create bogus keyboard input (like % for cursor left). if( mKeyVirtualKey == SDLK_RETURN ) + { + // fix return key not working when capslock or numlock are enabled + mKeyModifiers &= (~(KMOD_NUM | KMOD_CAPS | KMOD_MODE)); handleUnicodeUTF16( mKeyVirtualKey, mKeyModifiers ); + } // part of the fix for SL-13243 if (SDLCheckGrabbyKeys(event.key.keysym.sym, TRUE) != 0)