diff options
| author | Richard Linden <none@none> | 2012-01-17 11:55:19 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-17 11:55:19 -0800 |
| commit | facb0fa42cf7dbc4deb3a4026cc216aa0099111e (patch) | |
| tree | a96bb9bb96ddd26173174de9383c851cc356b110 /indra/llwindow | |
| parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) | |
| parent | 1f9529c0c2b02c4ceee912f8ecb35181174cc7cc (diff) | |
merge with viewer-development
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); |