summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-02-05 15:12:54 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-02-05 15:12:54 +0200
commit312f5553aea988a3a795ee45d00be861c1fc3aa9 (patch)
tree8676bad1bd1e68e90dfba505da5d2fcf4f3d7d2a /indra/llwindow
parentb80c6d68874a11292e7dff59b03b1d0f46fad232 (diff)
parent456bbdfa2f3471896f6981e70a9daa56dae51d18 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/llwindowsdl.cpp2
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());