diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-18 21:22:40 +0000 |
| commit | ce7682c2a468e926d6b38e4f95bd289a8d26222c (patch) | |
| tree | 80535a3916676294d640b4ce47c1895d0a27cd1b /indra/llcommon/indra_constants.h | |
| parent | e1ab7d8a30cc40cbd1d471c67def21508c82ff49 (diff) | |
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
Diffstat (limited to 'indra/llcommon/indra_constants.h')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index 7f1c48a215..4ef4d21833 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -110,10 +110,12 @@ const char CLOUD_LAYER_CODE = '8'; // keys // Bit masks for various keyboard modifier keys. -const MASK MASK_NONE = 0x0000; -const MASK MASK_CONTROL = 0x0001; -const MASK MASK_ALT = 0x0002; -const MASK MASK_SHIFT = 0x0004; +const MASK MASK_NONE = 0x0000; +const MASK MASK_CONTROL = 0x0001; // Mapped to cmd on Macs +const MASK MASK_ALT = 0x0002; +const MASK MASK_SHIFT = 0x0004; +const MASK MASK_NORMALKEYS = 0x0007; // A real mask - only get the bits for normal modifier keys +const MASK MASK_MAC_CONTROL = 0x0008; // Un-mapped Ctrl key on Macs, not used on Windows // Special keys go into >128 const KEY KEY_SPECIAL = 0x80; // special keys start here |