diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-10-17 14:58:29 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-10-17 14:58:29 -0700 |
| commit | 38d06dcce66ce3a7f5a7a1521f0305dbc0ea0bc5 (patch) | |
| tree | 38745f1a60a13b496014a64690e7afda14611830 /indra/newview/llappviewerlinux.cpp | |
| parent | b2eded73b9bf55e2253a9c39113ff0598c2c18cb (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
Merged lindenlab/viewer-release into default
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()) { |