summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-19 20:42:01 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-19 20:42:01 +0300
commitb078daf4d24d290abdc222e9cd3ef272c93ba5fa (patch)
treedc3b5f6578c33398218e734bbae417f8250a0515 /indra
parente45d695cc836b3a0acd6c5351654d9ae96c5e1b6 (diff)
SL-14977 Fix passing wrong codes to ToUnicodeEx
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerwindow.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 9c4eba25bc..783c46a33b 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2916,7 +2916,8 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
// ToUnicodeEx changes buffer state on OS below Win10, which is undesirable,
// but since we already did a TranslateMessage() in gatherInput(), this
// should have no negative effect
- int res = ToUnicodeEx(key, 0, keyboard_state, chars, char_count, 1 << 2 /*do not modify buffer flag*/, layout);
+ // ToUnicodeEx works with virtual key codes
+ int res = ToUnicodeEx(raw_key, 0, keyboard_state, chars, char_count, 1 << 2 /*do not modify buffer flag*/, layout);
if (res == 1 && chars[0] >= 0x20)
{
// Let it fall through to character handler and get a WM_CHAR.