diff options
| author | simon <none@none> | 2014-05-07 15:28:13 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-05-07 15:28:13 -0700 |
| commit | a5568f942b449e48cad71e92acd67eaa22dd5e5d (patch) | |
| tree | f266b99c9663fda8001cbde48aa5a6b1b9d7db68 /indra/llwindow/llkeyboard.cpp | |
| parent | 80a134ffcc68b277c10cc79dc9c7ca073148b41e (diff) | |
| parent | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (diff) | |
Merge downstream version 3.7.8 code
Diffstat (limited to 'indra/llwindow/llkeyboard.cpp')
| -rwxr-xr-x | indra/llwindow/llkeyboard.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 8b356ba138..f6f6c3931c 100755 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -187,7 +187,7 @@ BOOL LLKeyboard::translateKey(const U16 os_key, KEY *out_key) iter = mTranslateKeyMap.find(os_key); if (iter == mTranslateKeyMap.end()) { - //llwarns << "Unknown virtual key " << os_key << llendl; + //LL_WARNS() << "Unknown virtual key " << os_key << LL_ENDL; *out_key = 0; return FALSE; } @@ -258,7 +258,7 @@ BOOL LLKeyboard::handleTranslatedKeyUp(KEY translated_key, U32 translated_mask) handled = mCallbacks->handleTranslatedKeyUp(translated_key, translated_mask); } - lldebugst(LLERR_USER_INPUT) << "keyup -" << translated_key << "-" << llendl; + LL_DEBUGS("UserInput") << "keyup -" << translated_key << "-" << LL_ENDL; return handled; } @@ -321,7 +321,7 @@ BOOL LLKeyboard::keyFromString(const std::string& str, KEY *key) *key = res; return TRUE; } - llwarns << "keyFromString failed: " << str << llendl; + LL_WARNS() << "keyFromString failed: " << str << LL_ENDL; return FALSE; } @@ -363,7 +363,7 @@ std::string LLKeyboard::stringFromAccelerator( MASK accel_mask, KEY key ) if( trans == NULL ) { - llerrs << "No mKeyStringTranslator" << llendl; + LL_ERRS() << "No mKeyStringTranslator" << LL_ENDL; return res; } |