diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-30 22:27:01 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-30 22:27:01 -0500 |
| commit | a39937f9303ce2100ebb40d6fcaa8d36a14e3cb7 (patch) | |
| tree | 3c0d951cafadbd90c736cfbb9e2e4329d05407c7 /indra/llwindow/llwindowwin32.cpp | |
| parent | 6298daf266369dbd3600c5fdf287f9c680b2a897 (diff) | |
| parent | bd4c629e38aa2ab7223a5ef3b8e23ad91229b512 (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); |