diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2018-04-06 17:34:22 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2018-04-06 17:34:22 +0300 |
| commit | de9f589eecf39a4154727b25541a74d8f5f0948b (patch) | |
| tree | af0dbcd50836a2309461f50036d37209b20d27b8 /indra/media_plugins | |
| parent | 2dc1f3b7d9c927189101dfa550f1cd59e461f55a (diff) | |
MAINT-8501 FIXED [MAC] Web window doesn't close using 'ESC' button on the Login page.
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 0036250bb9..18810f5794 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -747,8 +747,9 @@ void MediaPluginCEF::keyEvent(dullahan::EKeyEvent key_event, LLSD native_key_dat bool event_isrepeat = native_key_data["event_isrepeat"].asBoolean(); // adding new code below in unicodeInput means we don't send ascii chars - // here too or we get double key presses on a mac. - if (((unsigned char)event_chars < 0x10 || (unsigned char)event_chars >= 0x7f )) + // here too or we get double key presses on a mac. + bool esc_key = (event_umodchars == 27); + if (esc_key || ((unsigned char)event_chars < 0x10 || (unsigned char)event_chars >= 0x7f )) { mCEFLib->nativeKeyboardEventOSX(key_event, event_modifiers, event_keycode, event_chars, |