diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
| commit | 57969e41db06cbc5c0f9ffdeafb7c21e55b2731d (patch) | |
| tree | ea54edd04380696ef3f83671204fdae2f7ae298e /indra/newview/llviewerkeyboard.cpp | |
| parent | c4c537e957458650a2948ffbd3a787f007d87f7a (diff) | |
| parent | eca30a22626b9a3e68e0e55f8da75614cd60d713 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
| -rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index fc2f00a2ea..2dc317e067 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -716,7 +716,7 @@ BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, c if (idx >=2 && idx <= 12) { U32 keyidx = ((mask<<16)|key); - (mRemapKeys[mode])[keyidx] = ((0<<16)|KEY_F1+(idx-1)); + (mRemapKeys[mode])[keyidx] = ((0<<16)|(KEY_F1+(idx-1))); return TRUE; } } |