summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-17 11:55:19 -0800
committerRichard Linden <none@none>2012-01-17 11:55:19 -0800
commitfacb0fa42cf7dbc4deb3a4026cc216aa0099111e (patch)
treea96bb9bb96ddd26173174de9383c851cc356b110 /indra/newview/llstartup.cpp
parent64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff)
parent1f9529c0c2b02c4ceee912f8ecb35181174cc7cc (diff)
merge with viewer-development
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 7e02a41e7e..3923b4510a 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -804,9 +804,8 @@ bool idle_startup()
#ifdef _WIN32
MSG msg;
while( PeekMessage( &msg, /*All hWnds owned by this thread */ NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE ) )
- {
- display_startup();
- }
+ { }
+ display_startup();
#endif
timeout.reset();
return FALSE;