summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerkeyboard.h
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-09-17 21:36:59 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-09-17 21:36:59 +0300
commitc21812bf095de2defa4e61978b2659764c838abf (patch)
tree6851ff2904bad56377e52f8d086e3b9ee0d32eb3 /indra/newview/llviewerkeyboard.h
parent50719510630768d65c9f00043676f287c58ca110 (diff)
SL-6109 Keyaboard support ready
Diffstat (limited to 'indra/newview/llviewerkeyboard.h')
-rw-r--r--indra/newview/llviewerkeyboard.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerkeyboard.h b/indra/newview/llviewerkeyboard.h
index 110dc89d28..2bfe285be4 100644
--- a/indra/newview/llviewerkeyboard.h
+++ b/indra/newview/llviewerkeyboard.h
@@ -71,8 +71,8 @@ public:
struct KeyMode : public LLInitParam::Block<KeyMode>
{
Multiple<KeyBinding> bindings;
- EKeyboardMode mode;
- KeyMode(EKeyboardMode mode);
+
+ KeyMode();
};
struct Keys : public LLInitParam::Block<Keys>
@@ -100,7 +100,7 @@ public:
void scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level);
private:
- S32 loadBindingMode(const LLViewerKeyboard::KeyMode& keymode);
+ S32 loadBindingMode(const LLViewerKeyboard::KeyMode& keymode, S32 mode);
BOOL bindKey(const S32 mode, const KEY key, const MASK mask, const std::string& function_name);
// Hold all the ugly stuff torn out to make LLKeyboard non-viewer-specific here