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/llkeyboard.h | |
parent | 51c01f5294b68b66706685346ecea16246b85cce (diff) | |
parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) |
Merge with 3.6.5
Diffstat (limited to 'indra/llwindow/llkeyboard.h')
-rwxr-xr-x | indra/llwindow/llkeyboard.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h index c155c1b362..92449c123f 100755 --- a/indra/llwindow/llkeyboard.h +++ b/indra/llwindow/llkeyboard.h @@ -82,6 +82,11 @@ public: virtual BOOL handleKeyUp(const U16 key, MASK mask) = 0; virtual BOOL handleKeyDown(const U16 key, MASK mask) = 0; + +#ifdef LL_DARWIN + // We only actually use this for OS X. + virtual void handleModifier(MASK mask) = 0; +#endif // LL_DARWIN // Asynchronously poll the control, alt, and shift keys and set the // appropriate internal key masks. |