diff options
author | dolphin <dolphin@lindenlab.com> | 2013-09-09 12:46:20 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-09-09 12:46:20 -0700 |
commit | 07cb32449f601e2d47e83d781af3bb9df2474d5c (patch) | |
tree | a913755d041e5ac780c840301ec4676894497e82 /indra/llwindow/llkeyboardheadless.cpp | |
parent | 51c01f5294b68b66706685346ecea16246b85cce (diff) | |
parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) |
Merge with 3.6.5
Diffstat (limited to 'indra/llwindow/llkeyboardheadless.cpp')
-rwxr-xr-x | indra/llwindow/llkeyboardheadless.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llwindow/llkeyboardheadless.cpp b/indra/llwindow/llkeyboardheadless.cpp index c87617c9ff..a1b6b294e0 100755 --- a/indra/llwindow/llkeyboardheadless.cpp +++ b/indra/llwindow/llkeyboardheadless.cpp @@ -45,6 +45,13 @@ BOOL LLKeyboardHeadless::handleKeyUp(const U16 key, const U32 mask) MASK LLKeyboardHeadless::currentMask(BOOL for_mouse_event) { return MASK_NONE; } +#ifdef LL_DARWIN +void LLKeyboardHeadless::handleModifier(MASK mask) +{ + +} +#endif + void LLKeyboardHeadless::scanKeyboard() { for (S32 key = 0; key < KEY_COUNT; key++) |