diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-30 13:31:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-30 13:31:26 -0400 |
| commit | e56ea836383bd357809f86e2ffebafee8f481222 (patch) | |
| tree | 8b5dd20b28261fba8b33953ef0f522914b2252c0 /indra/newview/llstartup.cpp | |
| parent | 6f71df192720ec3f16e7e7102ad21f4d140b8e07 (diff) | |
| parent | e60dac5ce486f55fe69949a6a3a2949d4f868193 (diff) | |
merge changes for latest core and updates from Kitty
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
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; |