summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-01-07 15:31:02 -0800
committerRick Pasetto <rick@lindenlab.com>2010-01-07 15:31:02 -0800
commitf0c6d8c50ea4ae454d5d24ec61e8ac1efd728341 (patch)
tree2e098806752eb3b3a066e9306be691883bd4a480
parent6abd41831a4cae5d757aa44675731d1fd48d64b1 (diff)
parent31b0e51de933154b063521f0b90f4468ad31cee2 (diff)
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
-rw-r--r--indra/llwindow/llkeyboardwin32.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp
index 35a3e7621a..ab5ecb4e63 100644
--- a/indra/llwindow/llkeyboardwin32.cpp
+++ b/indra/llwindow/llkeyboardwin32.cpp
@@ -80,7 +80,7 @@ LLKeyboardWin32::LLKeyboardWin32()
mTranslateKeyMap[VK_OEM_COMMA] = ',';
mTranslateKeyMap[VK_OEM_MINUS] = '-';
mTranslateKeyMap[VK_OEM_PERIOD] = '.';
- mTranslateKeyMap[VK_OEM_2] = KEY_PAD_DIVIDE;
+ mTranslateKeyMap[VK_OEM_2] = '/';//This used to be KEY_PAD_DIVIDE, but that breaks typing into text fields in media prims
mTranslateKeyMap[VK_OEM_3] = '`';
mTranslateKeyMap[VK_OEM_4] = '[';
mTranslateKeyMap[VK_OEM_5] = '\\';