summaryrefslogtreecommitdiff
path: root/indra/llwindow/llkeyboardmacosx.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-02 18:53:44 -0500
committerGeenz <geenz@geenzo.com>2013-01-02 18:53:44 -0500
commit9ce3ab1a5248423eeea4d843bfb8407ed62b305e (patch)
tree038e2c3839772df1e30297eb1b58f11a62adf680 /indra/llwindow/llkeyboardmacosx.cpp
parent966a4c893c816fc699580092bd6e93a0e514798c (diff)
Fixed the enter and return keys not being sent appropriately as unicode characters.
Diffstat (limited to 'indra/llwindow/llkeyboardmacosx.cpp')
-rw-r--r--indra/llwindow/llkeyboardmacosx.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llkeyboardmacosx.cpp b/indra/llwindow/llkeyboardmacosx.cpp
index 3f357c600e..077ebea909 100644
--- a/indra/llwindow/llkeyboardmacosx.cpp
+++ b/indra/llwindow/llkeyboardmacosx.cpp
@@ -206,7 +206,7 @@ MASK LLKeyboardMacOSX::updateModifiers(const U32 mask)
out_mask |= MASK_SHIFT;
}
- if(mask & (MAC_CTRL_KEY | MAC_CMD_KEY))
+ if(mask & MAC_CTRL_KEY || mask & MAC_CMD_KEY)
{
out_mask |= MASK_CONTROL;
}