summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorrider <rider@lindenlab.com>2015-11-13 16:38:35 -0800
committerrider <rider@lindenlab.com>2015-11-13 16:38:35 -0800
commitdf29aab81ba962d29b541fb84ffe0a682abcfaf5 (patch)
tree8c6ae5c146ea3b23fb634b1b5eab1cca3b1ce8a7 /indra/media_plugins
parentc2ad041c23b0097aec30acc7447a42f96d515d3b (diff)
Throw away any incomplete llsd messages that may have get sent on CR
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/cef/media_plugin_cef.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 9e7c390eb2..be69858d47 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -727,6 +727,12 @@ void MediaPluginCEF::keyEvent(LLCEFLib::EKeyEvent key_event, int key, LLCEFLib::
{
#if LL_DARWIN
+ if (!native_key_data.has("event_type") ||
+ !native_key_data.has("event_modifiers") ||
+ !native_key_data.has("event_keycode") ||
+ !native_key_data.has("event_isrepeat"))
+ return;
+
uint32_t eventType = native_key_data["event_type"].asInteger();
uint32_t eventModifiers = native_key_data["event_modifiers"].asInteger();
uint32_t eventKeycode = native_key_data["event_keycode"].asInteger();