diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2012-06-27 14:43:10 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2012-06-27 14:43:10 -0700 |
| commit | a68c7c27f9980a130af5eaf65c6731271a27b060 (patch) | |
| tree | fa2d9a9444cfe742d1db3166079fd6631a26ddbd /indra/llwindow/llkeyboard.cpp | |
| parent | 14ebeffe8776562c0ac9711a44b7ebe3dec49c47 (diff) | |
| parent | 8a7fa77f23b94f9ba2cb6da1942e4f86da314b5a (diff) | |
Merge pulled in lindenlab/viewer-beta to kelly_linden/maint-1078
Diffstat (limited to 'indra/llwindow/llkeyboard.cpp')
| -rw-r--r-- | indra/llwindow/llkeyboard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 53cecf9d4a..8b356ba138 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -46,7 +46,7 @@ LLKeyStringTranslatorFunc* LLKeyboard::mStringTranslator = NULL; // Used for l10 // Class Implementation // -LLKeyboard::LLKeyboard() : mCallbacks(NULL), mNumpadDistinct(ND_NUMLOCK_OFF) +LLKeyboard::LLKeyboard() : mCallbacks(NULL) { S32 i; |