summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-02-24 16:12:43 +0100
committerKitty Barnett <develop@catznip.com>2012-02-24 16:12:43 +0100
commite0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (patch)
tree44011ae0491941af0bfc1957d5f3b408c81123a4 /indra/newview/llstartup.cpp
parente615660823e680e824d2db0f1a59917597e64a13 (diff)
parent289d756ea86bd3898f41592146d8f549cd056846 (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 89360778d1..25a765dc8d 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -805,9 +805,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;