Merge branch 'develop' into rlva/base

1 files changed, 11 insertions, 7 deletions

diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h
index 713eb7aec2..d3c35b1ed4 100644
--- a/indra/llwindow/llkeyboard.h
+++ b/indra/llwindow/llkeyboard.h
@@ -55,6 +55,11 @@ class LLWindowCallbacks;
 class LLKeyboard
 {
 public:
+#ifndef LL_SDL
+    typedef U16 NATIVE_KEY_TYPE;
+#else
+    typedef U32 NATIVE_KEY_TYPE;
+#endif
     LLKeyboard();
     virtual ~LLKeyboard();
 
@@ -67,14 +72,13 @@ public:
     bool            getKeyDown(const KEY key) { return mKeyLevel[key]; }
     bool            getKeyRepeated(const KEY key) { return mKeyRepeated[key]; }
 
-    bool            translateKey(const U16 os_key, KEY *translated_key);
-    U16             inverseTranslateKey(const KEY translated_key);
+    bool            translateKey(const NATIVE_KEY_TYPE os_key, KEY *translated_key);
+    NATIVE_KEY_TYPE     inverseTranslateKey(const KEY translated_key);
     bool            handleTranslatedKeyUp(KEY translated_key, U32 translated_mask);     // Translated into "Linden" keycodes
     bool            handleTranslatedKeyDown(KEY translated_key, U32 translated_mask);   // Translated into "Linden" keycodes
 
-
-    virtual bool    handleKeyUp(const U16 key, MASK mask) = 0;
-    virtual bool    handleKeyDown(const U16 key, MASK mask) = 0;
+    virtual bool    handleKeyUp(const NATIVE_KEY_TYPE key, MASK mask) = 0;
+    virtual bool    handleKeyDown(const NATIVE_KEY_TYPE key, MASK mask) = 0;
 
 #ifdef LL_DARWIN
     // We only actually use this for macOS.
@@ -111,8 +115,8 @@ protected:
     void            addKeyName(KEY key, const std::string& name);
 
 protected:
-    std::map<U16, KEY>  mTranslateKeyMap;       // Map of translations from OS keys to Linden KEYs
-    std::map<KEY, U16>  mInvTranslateKeyMap;    // Map of translations from Linden KEYs to OS keys
+    std::map<NATIVE_KEY_TYPE, KEY>  mTranslateKeyMap;       // Map of translations from OS keys to Linden KEYs
+    std::map<KEY, NATIVE_KEY_TYPE>  mInvTranslateKeyMap;    // Map of translations from Linden KEYs to OS keys
     LLWindowCallbacks *mCallbacks;
 
     LLTimer         mKeyLevelTimer[KEY_COUNT];  // Time since level was set