diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-08-29 17:06:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-08-29 17:06:12 -0400 |
| commit | 6b24122857583537495a01f408c6c303f93adb02 (patch) | |
| tree | 382a25e202c5fd171dcb01fb3e82bbb12781540e /indra/newview/llappviewerlinux.cpp | |
| parent | 3d9c39c77cd4e4e8da8abf9234f1c751762985e6 (diff) | |
| parent | 20cf275d21c0dce569bb3a16393b529c5c9f1c6c (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc
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()) { |