diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
| commit | 8bb3d0891dfd87b54cd45dfe199c2f1bf21205b3 (patch) | |
| tree | 30f038fde12f74908f94be9079cdee759481c5a0 /indra/llwindow/llwindowwin32.cpp | |
| parent | 66c75202a8a99adeb7de443ce5ebe3d834f91c24 (diff) | |
| parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) | |
merge up to 3.4.5-release
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"); |