diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-12-02 13:48:27 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-12-02 13:48:27 +0200 |
| commit | 9abac37e42781aaacfc9331627182c2e83f98fd9 (patch) | |
| tree | bd7366d36008c0faaa10086a795131f8b8bf1944 /indra/newview/llsetkeybinddialog.h | |
| parent | dd887e24d5afd103f3b7b5ca756daad50c46953e (diff) | |
SL-14438 Fixed Viewer lost ability to assign Masks as keys
Diffstat (limited to 'indra/newview/llsetkeybinddialog.h')
| -rw-r--r-- | indra/newview/llsetkeybinddialog.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llsetkeybinddialog.h b/indra/newview/llsetkeybinddialog.h index 70190230e4..ec3c813a66 100644 --- a/indra/newview/llsetkeybinddialog.h +++ b/indra/newview/llsetkeybinddialog.h @@ -39,7 +39,7 @@ static const U32 ALLOW_MASK_MOUSE = 2; static const U32 ALLOW_KEYS = 4; //keyboard static const U32 ALLOW_MASK_KEYS = 8; static const U32 ALLOW_MASKS = 16; -static const U32 DEFAULT_KEY_FILTER = ALLOW_MOUSE | ALLOW_MASK_MOUSE | ALLOW_KEYS | ALLOW_MASK_KEYS; +static const U32 DEFAULT_KEY_FILTER = ALLOW_MOUSE | ALLOW_MASK_MOUSE | ALLOW_KEYS | ALLOW_MASKS | ALLOW_MASK_KEYS; class LLKeyBindResponderInterface @@ -68,7 +68,7 @@ public: // Wrapper around recordAndHandleKey // It does not record, it handles, but handleKey function is already in use - static bool recordKey(KEY key, MASK mask); + static bool recordKey(KEY key, MASK mask, BOOL down); BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down); static void onCancel(void* user_data); @@ -79,7 +79,7 @@ public: class Updater; private: - bool recordAndHandleKey(KEY key, MASK mask); + bool recordAndHandleKey(KEY key, MASK mask, BOOL down); void setKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes); LLKeyBindResponderInterface *pParent; LLCheckBoxCtrl *pCheckBox; |