diff options
| author | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
| commit | 15e6939342956f830996299352bcf7fffa7c3b85 (patch) | |
| tree | dcd6443f049d35b3f3401d768b1eab735eda363b /indra/llwindow/llkeyboardwin32.cpp | |
| parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) | |
| parent | 1d0d485b69bbbfd63d2d56a795d818131db2667c (diff) | |
merge with release
Diffstat (limited to 'indra/llwindow/llkeyboardwin32.cpp')
| -rwxr-xr-x | indra/llwindow/llkeyboardwin32.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp index be3fe5deb0..dc40dcdde0 100755 --- a/indra/llwindow/llkeyboardwin32.cpp +++ b/indra/llwindow/llkeyboardwin32.cpp @@ -28,10 +28,7 @@ #include "linden_common.h" -#define WIN32_LEAN_AND_MEAN -#include <winsock2.h> -#include <windows.h> - +#include "llwin32headerslean.h" #include "llkeyboardwin32.h" #include "llwindowcallbacks.h" @@ -269,7 +266,7 @@ void LLKeyboardWin32::scanKeyboard() // keydown in highest bit if (!pending_key_events && !(GetAsyncKeyState(virtual_key) & 0x8000)) { - //llinfos << "Key up event missed, resetting" << llendl; + //LL_INFOS() << "Key up event missed, resetting" << LL_ENDL; mKeyLevel[key] = FALSE; } } |