diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
| commit | 3e8bc28c88f16c1b8bba496704ec3a6156a25e1d (patch) | |
| tree | aa52be0bc7aa10d578ba000b8cd69d40271477a0 /indra/llwindow/llwindowwin32.cpp | |
| parent | 7e9ac192d779e77cad0a0b785510190215fbe7a6 (diff) | |
| parent | a30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff) | |
Merge
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 9a4dd41c4e..43c0090993 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -58,7 +58,6 @@ #include <dinput.h> #include <Dbt.h.> -#include "llmemtype.h" // culled from winuser.h #ifndef WM_MOUSEWHEEL /* Added to be compatible with later SDK's */ const S32 WM_MOUSEWHEEL = 0x020A; @@ -1773,8 +1772,6 @@ void LLWindowWin32::gatherInput() MSG msg; int msg_count = 0; - LLMemType m1(LLMemType::MTYPE_GATHER_INPUT); - while ((msg_count < MAX_MESSAGE_PER_UPDATE) && PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { mCallbacks->handlePingWatchdog(this, "Main:TranslateGatherInput"); |