diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
| commit | b2f77bee7ea98f5a4ff59e00095b5b3aff11e35b (patch) | |
| tree | 7695bb632502f24325f7044c69e30946e767abce /indra/llwindow | |
| parent | 79f1cd0a73bd86ff545ad78b9b1878e350d77416 (diff) | |
| parent | ea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff) | |
merge changes for vmrg-217
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); |