Merge pull request #1934 from secondlife/leviathan/game-control

Add GameControl behind feature-flag

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/llwindow/llkeyboardsdl.h b/indra/llwindow/llkeyboardsdl.h
index 9ebff66865..7671e4c859 100644
--- a/indra/llwindow/llkeyboardsdl.h
+++ b/indra/llwindow/llkeyboardsdl.h
@@ -33,22 +33,22 @@ class LLKeyboardSDL : public LLKeyboard
 {
 public:
     LLKeyboardSDL();
-    /*virtual*/ ~LLKeyboardSDL() {};
+    ~LLKeyboardSDL() {};
 
-    /*virtual*/ bool    handleKeyUp(const U32 key, MASK mask);
-    /*virtual*/ bool    handleKeyDown(const U32 key, MASK mask);
-    /*virtual*/ void    resetMaskKeys();
-    /*virtual*/ MASK    currentMask(bool for_mouse_event);
-    /*virtual*/ void    scanKeyboard();
+    bool    handleKeyUp(const LLKeyboard::NATIVE_KEY_TYPE key, MASK mask) override;
+    bool    handleKeyDown(const LLKeyboard::NATIVE_KEY_TYPE key, MASK mask) override;
+    void    resetMaskKeys() override;
+    MASK    currentMask(bool for_mouse_event) override;
+    void    scanKeyboard() override;
 
 protected:
-    MASK    updateModifiers(const U32 mask);
+    MASK    updateModifiers(const MASK mask) override;
     void    setModifierKeyLevel( KEY key, bool new_state );
-    bool    translateNumpadKey( const U32 os_key, KEY *translated_key );
-    U16 inverseTranslateNumpadKey(const KEY translated_key);
+    bool    translateNumpadKey( const LLKeyboard::NATIVE_KEY_TYPE os_key, KEY *translated_key );
+    LLKeyboard::NATIVE_KEY_TYPE inverseTranslateNumpadKey(const KEY translated_key);
 private:
-    std::map<U32, KEY> mTranslateNumpadMap;  // special map for translating OS keys to numpad keys
-    std::map<KEY, U32> mInvTranslateNumpadMap; // inverse of the above
+    std::map<LLKeyboard::NATIVE_KEY_TYPE, KEY> mTranslateNumpadMap;  // special map for translating OS keys to numpad keys
+    std::map<KEY, LLKeyboard::NATIVE_KEY_TYPE> mInvTranslateNumpadMap; // inverse of the above
 
 public:
     static U32 mapSDL2toWin( U32 );