diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:41:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:41:36 -0500 |
| commit | 1ffd7c99afe25da37a83a2a1dd8a03c7275a5f6b (patch) | |
| tree | ad40ea009c5ebea67dd5334d210d90b6dbeebbd3 /indra/media_plugins/webkit/media_plugin_webkit.cpp | |
| parent | 202d86b15567a783bed55849a7cdc8ad8d8f874f (diff) | |
| parent | a9609ae1557a70e095088e0a9b6ef5564dfdb388 (diff) | |
automated merge for avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/media_plugins/webkit/media_plugin_webkit.cpp')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 30c7483229..25f4c8720a 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -497,7 +497,16 @@ private: { // std::cerr << "unicode input, code = 0x" << std::hex << (unsigned long)(wstr[i]) << std::dec << std::endl; - LLQtWebKit::getInstance()->unicodeInput(mBrowserWindowId, wstr[i], modifiers); + if(wstr[i] == 32) + { + // For some reason, the webkit plugin really wants the space bar to come in through the key-event path, not the unicode path. + LLQtWebKit::getInstance()->keyEvent( mBrowserWindowId, LLQtWebKit::KE_KEY_DOWN, 32, modifiers); + LLQtWebKit::getInstance()->keyEvent( mBrowserWindowId, LLQtWebKit::KE_KEY_UP, 32, modifiers); + } + else + { + LLQtWebKit::getInstance()->unicodeInput(mBrowserWindowId, wstr[i], modifiers); + } } checkEditState(); |