diff options
author | Rider Linden <rider@lindenlab.com> | 2016-07-21 09:08:28 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-07-21 09:08:28 -0700 |
commit | 31009296bb8658155b1622395f9a0e9eb2ab3a51 (patch) | |
tree | 4bcacc043c143079a0e70cb0aa22ad2c444674d1 /indra/newview/llappviewerwin32.cpp | |
parent | d0d07ccac565632497c50510714b30503be8aa94 (diff) | |
parent | 9c49a6c91dd9b5bbe811fcd91d8992ed6bac33e7 (diff) |
Merge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r-- | indra/newview/llappviewerwin32.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 4786f83bfd..a7f248ab5a 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -317,10 +317,8 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, } // Run the application main loop - if(!LLApp::isQuitting()) - { - viewer_app_ptr->mainLoop(); - } + while (! viewer_app_ptr->frame()) + {} if (!LLApp::isError()) { |