diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:47:38 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-05 16:47:38 -0800 |
commit | 91b2ff00ae874f938919373c0db3de0721c7bf25 (patch) | |
tree | e0c4c8e11cd4a158c1f7d53fea7434eee3781d97 /indra/llwindow | |
parent | 617a7a0ebdd47aeea578456f4ed0d91ab8582a0b (diff) | |
parent | 68ea862c96a96be631505e88ae870d6aab066eb9 (diff) |
Merge
Diffstat (limited to 'indra/llwindow')
-rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index bfdf1147a1..f9c3694459 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -1617,7 +1617,7 @@ void LLWindowSDL::processMiscNativeEvents() pump_timer.setTimerExpirySec(1.0f / 15.0f); do { // Always do at least one non-blocking pump - gtk_main_iteration_do(0); + gtk_main_iteration_do(FALSE); } while (gtk_events_pending() && !pump_timer.hasExpired()); |