diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-30 10:23:06 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-30 10:23:06 -0500 |
| commit | 9bbaf3ab14cf131a1938455c99d3cf0f4abc176c (patch) | |
| tree | 4292dd5c7fe667ef23e8c0ed821c973818726363 /indra/llwindow | |
| parent | a2544b18e8e1d49092a32833ddfc39826d1a5495 (diff) | |
| parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) | |
merge
Diffstat (limited to 'indra/llwindow')
| -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); |