diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-30 10:15:08 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-30 10:15:08 -0500 |
| commit | 56973912198ba3410d1ab32d1a8a63a1c8c3348e (patch) | |
| tree | c3d03123918bf832613913a7688cca02babe7515 /indra/llwindow/llwindowwin32.cpp | |
| parent | dee66ccb3af6e8590c089a6fe1f1a0d0ffeacab8 (diff) | |
| parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) | |
merge
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); |