diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-03-01 16:43:15 -0800 | 
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-03-01 16:43:15 -0800 | 
| commit | f49033efcfec6ee0df69c346c8d6e04345d5c87c (patch) | |
| tree | e9704af459ebce148162a400272e804c4d911491 /indra/media_plugins | |
| parent | 1243e41670dc8bfc6bbb43700b1340b9655a818d (diff) | |
Fix up slight change to Dullahan interface where we call out the platform for native keyboard injection to match OSX version
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 99958e0d81..33a5f32089 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -861,7 +861,7 @@ void MediaPluginCEF::keyEvent(dullahan::EKeyEvent key_event, int key, dullahan::  	U32 wparam = ll_U32_from_sd(native_key_data["w_param"]);  	U64 lparam = ll_U32_from_sd(native_key_data["l_param"]); -	mCEFLib->nativeKeyboardEvent(msg, wparam, lparam); +	mCEFLib->nativeKeyboardEventWin(msg, wparam, lparam);  #endif  }; @@ -884,7 +884,7 @@ void MediaPluginCEF::unicodeInput(const std::string &utf8str, dullahan::EKeyboar  	U32 msg = ll_U32_from_sd(native_key_data["msg"]);  	U32 wparam = ll_U32_from_sd(native_key_data["w_param"]);  	U64 lparam = ll_U32_from_sd(native_key_data["l_param"]); -	mCEFLib->nativeKeyboardEvent(msg, wparam, lparam); +	mCEFLib->nativeKeyboardEventWin(msg, wparam, lparam);  #endif  }; | 
