diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-10-18 16:59:15 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-10-18 16:59:15 -0400 |
| commit | 02001352246fca709ffb00938ac349512a30dfd6 (patch) | |
| tree | c9ffa6e5c86066020ba6108d0e5a9956bc793c64 /indra/newview/llappviewerlinux.cpp | |
| parent | 8230a9937f3bded847dae6c33e01b44158a7f8ee (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index f5742b29cf..6f32aab851 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -95,10 +95,8 @@ int main( int argc, char **argv ) } // Run the application main loop - if(!LLApp::isQuitting()) - { - viewer_app_ptr->mainLoop(); - } + while (! viewer_app_ptr->frame()) + {} if (!LLApp::isError()) { |