diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 20:04:18 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 20:04:18 +0000 |
| commit | 612de8276a9401e41a6f784ae5b92729a3bfbf15 (patch) | |
| tree | 4502d51fddb1962ba54c49b2c541a84a79cc5b95 /indra/media_plugins | |
| parent | 871a40f2f290106f9da58dd4d09cec28fbecb0fa (diff) | |
| parent | 9a19daccd0a8a711ce01b140febf5fc632df0e57 (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 |
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 |