diff options
Diffstat (limited to 'indra/llwindow/llkeyboard.cpp')
| -rw-r--r-- | indra/llwindow/llkeyboard.cpp | 41 |
1 files changed, 6 insertions, 35 deletions
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 44679d3843..cb0c312a1d 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -227,7 +227,7 @@ LLKeyboard::NATIVE_KEY_TYPE LLKeyboard::inverseTranslateKey(const KEY translated } -bool LLKeyboard::handleTranslatedKeyDown(KEY translated_key, U32 translated_mask) +bool LLKeyboard::handleTranslatedKeyDown(KEY translated_key, MASK translated_mask) { bool handled = false; bool repeated = false; @@ -255,7 +255,7 @@ bool LLKeyboard::handleTranslatedKeyDown(KEY translated_key, U32 translated_mask } -bool LLKeyboard::handleTranslatedKeyUp(KEY translated_key, U32 translated_mask) +bool LLKeyboard::handleTranslatedKeyUp(KEY translated_key, MASK translated_mask) { bool handled = false; if( mKeyLevel[translated_key] ) @@ -276,58 +276,29 @@ bool LLKeyboard::handleTranslatedKeyUp(KEY translated_key, U32 translated_mask) return handled; } -<<<<<<< HEAD -bool LLKeyboard::handleKeyDown(const U16 key, const U32 mask) -{ - U32 translated_mask = updateModifiers(mask); -======= -bool LLKeyboard::handleKeyDown(const U16 key, const MASK mask) +bool LLKeyboard::handleKeyDown(const NATIVE_KEY_TYPE key, const MASK mask) { - U32 translated_mask = updateModifiers(mask); ->>>>>>> 7733b56eab (Add GameControl UI for per device settings) + MASK translated_mask = updateModifiers(mask); KEY translated_key = 0; bool handled = false; if(translateKey(key, &translated_key)) { handled = handleTranslatedKeyDown(translated_key, translated_mask); } -<<<<<<< HEAD - if (!handled) - { - LLGameControl::onKeyDown(translated_key, translated_mask); - } - -======= ->>>>>>> 7733b56eab (Add GameControl UI for per device settings) return handled; } -<<<<<<< HEAD -bool LLKeyboard::handleKeyUp(const U16 key, const U32 mask) +bool LLKeyboard::handleKeyUp(const NATIVE_KEY_TYPE key, const MASK mask) { - U32 translated_mask = updateModifiers(mask); - -======= -bool LLKeyboard::handleKeyUp(const U16 key, const MASK mask) -{ - U32 translated_mask = updateModifiers(mask); ->>>>>>> 7733b56eab (Add GameControl UI for per device settings) + MASK translated_mask = updateModifiers(mask); KEY translated_key = 0; bool handled = false; if(translateKey(key, &translated_key)) { handled = handleTranslatedKeyUp(translated_key, translated_mask); } -<<<<<<< HEAD - if (!handled) - { - LLGameControl::onKeyUp(translated_key, translated_mask); - } - -======= ->>>>>>> 7733b56eab (Add GameControl UI for per device settings) return handled; } |