diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
| commit | 3cdce9bf24ebac1c48b30955910a8f6b36797cb5 (patch) | |
| tree | 5f731c4237dfe544e475c7d5f119aa2c6e8edcb8 /indra/media_plugins | |
| parent | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
merge changes for 5.1.6-release
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 2ac43accc5..2bd5526a86 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -810,8 +810,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, |