From a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 4 Mar 2008 16:59:57 +0000 Subject: 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 --- indra/llwindow/llkeyboardsdl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llwindow/llkeyboardsdl.cpp') diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp index d832506078..d29d917def 100644 --- a/indra/llwindow/llkeyboardsdl.cpp +++ b/indra/llwindow/llkeyboardsdl.cpp @@ -103,7 +103,7 @@ LLKeyboardSDL::LLKeyboardSDL() mTranslateKeyMap[SDLK_KP_PLUS] = KEY_ADD; mTranslateKeyMap[SDLK_KP_MINUS] = KEY_SUBTRACT; mTranslateKeyMap[SDLK_KP_MULTIPLY] = KEY_MULTIPLY; - mTranslateKeyMap[SDLK_KP_DIVIDE] = KEY_DIVIDE; + mTranslateKeyMap[SDLK_KP_DIVIDE] = KEY_PAD_DIVIDE; mTranslateKeyMap[SDLK_F1] = KEY_F1; mTranslateKeyMap[SDLK_F2] = KEY_F2; mTranslateKeyMap[SDLK_F3] = KEY_F3; @@ -121,7 +121,7 @@ LLKeyboardSDL::LLKeyboardSDL() mTranslateKeyMap[SDLK_MINUS] = '-'; mTranslateKeyMap[SDLK_PERIOD] = '.'; mTranslateKeyMap[SDLK_BACKQUOTE] = '`'; - mTranslateKeyMap[SDLK_SLASH] = '/'; + mTranslateKeyMap[SDLK_SLASH] = KEY_DIVIDE; mTranslateKeyMap[SDLK_SEMICOLON] = ';'; mTranslateKeyMap[SDLK_LEFTBRACKET] = '['; mTranslateKeyMap[SDLK_BACKSLASH] = '\\'; -- cgit v1.3