diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-07-13 10:44:40 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-07-13 10:44:40 -0400 |
| commit | cd1c64d68986a9d6ce2f41cd00a720681b738013 (patch) | |
| tree | d064cccb72bdc03b888075d06a30b2ab3d244442 /indra/newview/llappviewerlinux.cpp | |
| parent | f868e29945806fd6cefde65067ae2c870ac112a6 (diff) | |
| parent | b031b1a6255af0813698bd40586f30f7b0a76f58 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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()) { |