diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2024-05-08 23:32:58 +0200 |
|---|---|---|
| committer | Andrew Meadows <andrew.l.meadows@gmail.com> | 2024-10-03 09:02:09 -0700 |
| commit | 2daf175650cdda7cc8f820b6cb17b1475496e7ac (patch) | |
| tree | 0ece9bb592a922fbcb3f4532aee10941e307f44f /indra/llwindow/llkeyboard.cpp | |
| parent | ec39ac89e8529da206dafd519d75ad5944888076 (diff) | |
Add GameControl UI for per device settings
Diffstat (limited to 'indra/llwindow/llkeyboard.cpp')
| -rw-r--r-- | indra/llwindow/llkeyboard.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 7784e6c32a..44679d3843 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -276,40 +276,58 @@ 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) +{ + U32 translated_mask = updateModifiers(mask); +>>>>>>> 7733b56eab (Add GameControl UI for per device settings) 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) { 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) 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; } |