diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 16:35:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 16:35:49 +0300 |
| commit | e49dcb8d0c9f539997effb640e350d9d0689aae6 (patch) | |
| tree | 1bf99eaccce6de17c62f13c6595f7f497548dc5c /indra/llwindow/llkeyboardsdl.cpp | |
| parent | 531cd34f670170ade57f8813fe48012b61a1d3c2 (diff) | |
| parent | 5f8a7374b9f18e0112d6749a9c845bd077a81acb (diff) | |
Merge pull request #1476 from secondlife/marchcat/x-b-merge
Maint X -> Maint B merge
Diffstat (limited to 'indra/llwindow/llkeyboardsdl.cpp')
| -rw-r--r-- | indra/llwindow/llkeyboardsdl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp index b29b832011..0fe0b5b771 100644 --- a/indra/llwindow/llkeyboardsdl.cpp +++ b/indra/llwindow/llkeyboardsdl.cpp @@ -70,7 +70,7 @@ LLKeyboardSDL::LLKeyboardSDL() //mTranslateKeyMap[SDLK_KP3] = KEY_PAGE_DOWN; //mTranslateKeyMap[SDLK_KP0] = KEY_INSERT; - mTranslateKeyMap[SDLK_SPACE] = ' '; // <FS:ND/> Those are handled by SDL2 via text input, do not map them + mTranslateKeyMap[SDLK_SPACE] = ' '; // <FS:ND/> Those are handled by SDL2 via text input, do not map them mTranslateKeyMap[SDLK_RETURN] = KEY_RETURN; mTranslateKeyMap[SDLK_LEFT] = KEY_LEFT; mTranslateKeyMap[SDLK_RIGHT] = KEY_RIGHT; @@ -229,8 +229,8 @@ static U32 adjustNativekeyFromUnhandledMask(const U32 key, const U32 mask) BOOL LLKeyboardSDL::handleKeyDown(const U32 key, const U32 mask) { U32 adjusted_nativekey; - KEY translated_key = 0; - U32 translated_mask = MASK_NONE; + KEY translated_key = 0; + U32 translated_mask = MASK_NONE; BOOL handled = FALSE; adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask); @@ -249,8 +249,8 @@ BOOL LLKeyboardSDL::handleKeyDown(const U32 key, const U32 mask) BOOL LLKeyboardSDL::handleKeyUp(const U32 key, const U32 mask) { U32 adjusted_nativekey; - KEY translated_key = 0; - U32 translated_mask = MASK_NONE; + KEY translated_key = 0; + U32 translated_mask = MASK_NONE; BOOL handled = FALSE; adjusted_nativekey = adjustNativekeyFromUnhandledMask(key, mask); |