diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:17:12 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:17:12 -0700 |
| commit | 9833a50260fb45d5f0033200ae756834c0cc9940 (patch) | |
| tree | 7b1462d2c0802fb175746a8d05100bb8c102640f /indra/llwindow | |
| parent | 8c74ed2a58f5443b931374489b04ba80fb11a590 (diff) | |
MAINT-5754: For MoaP and MediaCtrls forward all events including KEYUP and KEYDOWN to the CEF plugin.
Diffstat (limited to 'indra/llwindow')
| -rwxr-xr-x | indra/llwindow/llkeyboardwin32.cpp | 4 | ||||
| -rwxr-xr-x | indra/llwindow/llwindowwin32.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp index dc40dcdde0..2123ed3939 100755 --- a/indra/llwindow/llkeyboardwin32.cpp +++ b/indra/llwindow/llkeyboardwin32.cpp @@ -258,7 +258,7 @@ void LLKeyboardWin32::scanKeyboard() // *TODO: I KNOW there must be a better way of // interrogating the key state than this, using async key // state can cause ALL kinds of bugs - Doug - if (key < KEY_BUTTON0) + if ((key < KEY_BUTTON0) && ((key < '0') || (key > '9'))) { // ...under windows make sure the key actually still is down. // ...translate back to windows key @@ -267,7 +267,7 @@ void LLKeyboardWin32::scanKeyboard() if (!pending_key_events && !(GetAsyncKeyState(virtual_key) & 0x8000)) { //LL_INFOS() << "Key up event missed, resetting" << LL_ENDL; - mKeyLevel[key] = FALSE; + mKeyLevel[key] = FALSE; } } } diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 376bef3e50..1a775eadaf 100755 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -126,7 +126,7 @@ protected: HCURSOR loadColorCursor(LPCTSTR name); BOOL isValid(); void moveWindow(const LLCoordScreen& position,const LLCoordScreen& size); - LLSD getNativeKeyData(); + virtual LLSD getNativeKeyData(); // Changes display resolution. Returns true if successful BOOL setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh); |