1 files changed, 35 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 5bdb26f..c0d1460 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -770,7 +770,38 @@ bool LLViewerMediaImpl::handleKeyHere(KEY key, MASK mask)
         
         if (mMediaSource)
         {
-                result = mMediaSource->keyEvent(LLPluginClassMedia::KEY_EVENT_DOWN ,key, mask);
+                // FIXME: THIS IS SO WRONG.
+                // Menu keys should be handled by the menu system and not passed to UI elements, but this is how LLTextEditor and LLLineEditor do it...
+                if( MASK_CONTROL & mask )
+                {
+                        if( 'C' == key )
+                        {
+                                mMediaSource->copy();
+                                result = true;
+                        }
+                        else
+                        if( 'V' == key )
+                        {
+                                mMediaSource->paste();
+                                result = true;
+                        }
+                        else
+                        if( 'X' == key )
+                        {
+                                mMediaSource->cut();
+                                result = true;
+                        }
+                }
+                
+                if(!result)
+                {
+                        
+                        LLSD native_key_data = gViewerWindow->getWindow()->getNativeKeyData();
+                        
+                        result = mMediaSource->keyEvent(LLPluginClassMedia::KEY_EVENT_DOWN ,key, mask, native_key_data);
+                        // Since the viewer internal event dispatching doesn't give us key-up events, simulate one here.
+                        (void)mMediaSource->keyEvent(LLPluginClassMedia::KEY_EVENT_UP ,key, mask, native_key_data);
+                }
         }
         
         return result;
@@ -787,7 +818,9 @@ bool LLViewerMediaImpl::handleUnicodeCharHere(llwchar uni_char)
                 if (uni_char >= 32 // discard 'control' characters
                         && uni_char != 127) // SDL thinks this is 'delete' - yuck.
                 {
-                        mMediaSource->textInput(wstring_to_utf8str(LLWString(1, uni_char)), gKeyboard->currentMask(FALSE));
+                        LLSD native_key_data = gViewerWindow->getWindow()->getNativeKeyData();
+                        
+                        mMediaSource->textInput(wstring_to_utf8str(LLWString(1, uni_char)), gKeyboard->currentMask(FALSE), native_key_data);
                 }
         }