diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-01-18 17:58:12 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-01-18 17:58:12 -0800 |
commit | fae9c8fe864278b20dfdb7caae3fbc50c779947b (patch) | |
tree | b85532991ef5ec3d87769aeab053c52918e36089 /indra/test_apps/llplugintest | |
parent | 7590704e0e93b48f897c47dba07916efebd95274 (diff) |
Added getNativeKeyData() function to LLWindow and LLWindowMacOSX.
Added an LLSD argument to LLPluginClassMedia::keyEvent() and LLPluginClassMedia::textInput() which contains the native key data.
Made LLViewerMediaImpl retrieve the native key data and pass it to keyEvent and textInput.
Added a native_key_data parameter to the text_event and key_event messages.
Made the webkit plugin extract the native_key_data parameter and pass it to the internal keyEvent() and unicodeInput() functions.
Fixed LLMediaPluginTest to match function signature change to LLPluginClassMedia::keyEvent().
Diffstat (limited to 'indra/test_apps/llplugintest')
-rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index d183aac208..0ff53f3e00 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -1169,8 +1169,8 @@ void LLMediaPluginTest::keyboard( int key ) exit( 0 ); }; - mSelectedPanel->mMediaSource->keyEvent( LLPluginClassMedia::KEY_EVENT_DOWN, key, 0 ); - mSelectedPanel->mMediaSource->keyEvent( LLPluginClassMedia::KEY_EVENT_UP, key, 0 ); + mSelectedPanel->mMediaSource->keyEvent( LLPluginClassMedia::KEY_EVENT_DOWN, key, 0 , LLSD()); + mSelectedPanel->mMediaSource->keyEvent( LLPluginClassMedia::KEY_EVENT_UP, key, 0, LLSD()); }; //////////////////////////////////////////////////////////////////////////////// |