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/llkeyboardwin32.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/llkeyboardwin32.cpp')
| -rw-r--r-- | indra/llwindow/llkeyboardwin32.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp index a5e7f3b3fe..e8aaa658ca 100644 --- a/indra/llwindow/llkeyboardwin32.cpp +++ b/indra/llwindow/llkeyboardwin32.cpp @@ -77,7 +77,7 @@ LLKeyboardWin32::LLKeyboardWin32() mTranslateKeyMap[VK_OEM_COMMA] = ','; mTranslateKeyMap[VK_OEM_MINUS] = '-'; mTranslateKeyMap[VK_OEM_PERIOD] = '.'; - mTranslateKeyMap[VK_OEM_2] = '/'; + mTranslateKeyMap[VK_OEM_2] = KEY_PAD_DIVIDE; mTranslateKeyMap[VK_OEM_3] = '`'; mTranslateKeyMap[VK_OEM_4] = '['; mTranslateKeyMap[VK_OEM_5] = '\\'; @@ -137,7 +137,11 @@ LLKeyboardWin32::LLKeyboardWin32() mTranslateNumpadMap[0x67] = KEY_PAD_HOME; // keypad 7 mTranslateNumpadMap[0x68] = KEY_PAD_UP; // keypad 8 mTranslateNumpadMap[0x69] = KEY_PAD_PGUP; // keypad 9 + mTranslateNumpadMap[0x6A] = KEY_PAD_MULTIPLY; // keypad * + mTranslateNumpadMap[0x6B] = KEY_PAD_ADD; // keypad + + mTranslateNumpadMap[0x6D] = KEY_PAD_SUBTRACT; // keypad - mTranslateNumpadMap[0x6E] = KEY_PAD_DEL; // keypad . + mTranslateNumpadMap[0x6F] = KEY_PAD_DIVIDE; // keypad / for (iter = mTranslateNumpadMap.begin(); iter != mTranslateNumpadMap.end(); iter++) { |