diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-30 15:54:39 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-30 15:54:39 -0800 |
| commit | fd56967dea7e4c53080a1ef89cc550492baf3fc8 (patch) | |
| tree | 2a7a7993a550afbd7e92975cc53d633e41404583 /indra/llwindow/llwindowwin32.cpp | |
| parent | c4084c71386e34f6c28d4c10199eaf1155a2855b (diff) | |
| parent | 56973912198ba3410d1ab32d1a8a63a1c8c3348e (diff) | |
Merge with latest
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 954b9f2b15..228fbefd19 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -1747,7 +1747,7 @@ void LLWindowWin32::gatherInput() LLMemType m1(LLMemType::MTYPE_GATHER_INPUT); - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) && msg_count < MAX_MESSAGE_PER_UPDATE) + while ((msg_count < MAX_MESSAGE_PER_UPDATE) && PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { mCallbacks->handlePingWatchdog(this, "Main:TranslateGatherInput"); TranslateMessage(&msg); |