Merge pull request #2652 from secondlife/lua-merge-dev2

Merge develop into release/luau-scripting

1 files changed, 7 insertions, 2 deletions

diff --git a/indra/llwindow/llkeyboardheadless.h b/indra/llwindow/llkeyboardheadless.h
index 2528f0e3f1..439abaf25b 100644
--- a/indra/llwindow/llkeyboardheadless.h
+++ b/indra/llwindow/llkeyboardheadless.h
@@ -35,8 +35,13 @@ public:
     LLKeyboardHeadless();
     /*virtual*/ ~LLKeyboardHeadless() {};
 
-    /*virtual*/ bool    handleKeyUp(const U16 key, MASK mask);
-    /*virtual*/ bool    handleKeyDown(const U16 key, MASK mask);
+#ifndef LL_SDL
+    /*virtual*/ bool    handleKeyUp(const U16 key, MASK mask) { return false; }
+    /*virtual*/ bool    handleKeyDown(const U16 key, MASK mask) { return false; }
+#else
+    /*virtual*/ bool    handleKeyUp(const U32 key, MASK mask) { return false; }
+    /*virtual*/ bool    handleKeyDown(const U32 key, MASK mask) { return false; }
+#endif
     /*virtual*/ void    resetMaskKeys();
     /*virtual*/ MASK    currentMask(bool for_mouse_event);
     /*virtual*/ void    scanKeyboard();