summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-09 18:19:35 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-09 18:19:35 +0000
commit6d08400145c3e3016ab3bccfe24474e52b435c72 (patch)
treece204654c60f34e9bb52932b242d7df4dc9b5804 /indra/media_plugins
parentc9b27bec33d601330afe854d0322d22fce9da76a (diff)
EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media
This change lets Linux pass keys through to Flash.
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/webkit/media_plugin_webkit.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 22e285cdb8..688d3bcd3d 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -488,6 +488,10 @@ private:
native_scan_code = (uint32_t)(native_key_data["scan_code"].asInteger());
native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
// TODO: I don't think we need to do anything with native modifiers here -- please verify
+#elif LL_LINUX
+ native_scan_code = (uint32_t)(native_key_data["scan_code"].asInteger());
+ native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
+ native_modifiers = (uint32_t)(native_key_data["modifiers"].asInteger());
#else
// Add other platforms here as needed
#endif