summaryrefslogtreecommitdiff
path: root/indra/llwindow/llkeyboard.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-09-09 14:51:34 -0400
committerOz Linden <oz@lindenlab.com>2013-09-09 14:51:34 -0400
commitc4b070ae0011a0c2aa8dd3d01c5f3ad3ecbd3ec3 (patch)
treed9da12a63dad133b557ff14972844e21dee8dc34 /indra/llwindow/llkeyboard.h
parent8dc273b942ca3bae7469dcbaf7bab171b889eea1 (diff)
parent55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff)
merge changes for 3.6.5-release
Diffstat (limited to 'indra/llwindow/llkeyboard.h')
-rwxr-xr-xindra/llwindow/llkeyboard.h5
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.