diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-02-08 18:17:15 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-08 18:17:15 -0800 |
commit | bf2273d0adce6aae0a8c93f74d5cafe32e341674 (patch) | |
tree | b19456ead3b12f23842ff48ea51a11ad625946ea /indra/test_apps | |
parent | 41da63f5e665d793d328e52973cb4de63d3da6a0 (diff) | |
parent | d321c6aa98c27931a4d141953ce86c23baa7162b (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/test_apps')
-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()); }; //////////////////////////////////////////////////////////////////////////////// |