diff options
| author | Geenz <geenz@geenzo.com> | 2013-03-11 10:16:22 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-03-11 10:16:22 -0400 |
| commit | 5caa7a465e73fc9cf70f5f2c5d147a509bd5e185 (patch) | |
| tree | d0a5cbbd80b01478f78b62d5015e2677671b34de /indra/llwindow/llkeyboardmacosx.cpp | |
| parent | f3316f8aa2484a93a35b93a3dd4961b8bad7f751 (diff) | |
Bug fixing and prep-work for IME support (along with refactored text input in general).
Diffstat (limited to 'indra/llwindow/llkeyboardmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llkeyboardmacosx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llkeyboardmacosx.cpp b/indra/llwindow/llkeyboardmacosx.cpp index d4c8214461..274e92c225 100644 --- a/indra/llwindow/llkeyboardmacosx.cpp +++ b/indra/llwindow/llkeyboardmacosx.cpp @@ -213,7 +213,7 @@ MASK LLKeyboardMacOSX::updateModifiers(const U32 mask) out_mask |= MASK_SHIFT; } - if(mask & MAC_CTRL_KEY || mask & MAC_CMD_KEY) + if(mask & (MAC_CTRL_KEY | MAC_CMD_KEY)) { out_mask |= MASK_CONTROL; } @@ -267,7 +267,7 @@ MASK LLKeyboardMacOSX::currentMask(BOOL for_mouse_event) if (mask & MAC_SHIFT_KEY) result |= MASK_SHIFT; if (mask & MAC_CTRL_KEY) result |= MASK_CONTROL; - if (mask & MAC_ALT_KEY) result |= MASK_ALT; + if (mask & MAC_ALT_KEY) result |= MASK_ALT; // For keyboard events, consider Command equivalent to Control if (!for_mouse_event) |