diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
| commit | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch) | |
| tree | 051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/llwindow/llkeyboardmacosx.cpp | |
| parent | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff) | |
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
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 74b64b4826..b415ba43c7 100644 --- a/indra/llwindow/llkeyboardmacosx.cpp +++ b/indra/llwindow/llkeyboardmacosx.cpp @@ -83,7 +83,7 @@ LLKeyboardMacOSX::LLKeyboardMacOSX() mTranslateKeyMap[0x29] = ';'; mTranslateKeyMap[0x2a] = '\\'; mTranslateKeyMap[0x2b] = ','; - mTranslateKeyMap[0x2c] = '/'; + mTranslateKeyMap[0x2c] = KEY_DIVIDE; mTranslateKeyMap[0x2d] = 'N'; mTranslateKeyMap[0x2e] = 'M'; mTranslateKeyMap[0x2f] = '.'; @@ -100,7 +100,7 @@ LLKeyboardMacOSX::LLKeyboardMacOSX() mTranslateKeyMap[0x41] = '.'; // keypad mTranslateKeyMap[0x43] = '*'; // keypad mTranslateKeyMap[0x45] = '+'; // keypad - mTranslateKeyMap[0x4b] = '/'; // keypad + mTranslateKeyMap[0x4b] = KEY_PAD_DIVIDE; // keypad mTranslateKeyMap[0x4c] = KEY_RETURN; // keypad enter mTranslateKeyMap[0x4e] = '-'; // keypad mTranslateKeyMap[0x51] = '='; // keypad |