diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-09-06 11:07:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-09-06 11:07:39 -0400 |
| commit | 5edd4cecfc53b8287e1b3c6a22142bc72b8e0356 (patch) | |
| tree | b5bed4e1e4279b88ae882d93264dc2234ecb81e8 /indra/newview/llappviewerlinux.cpp | |
| parent | 8c86c594be7b7898ac6e622c505181cf5b000da6 (diff) | |
| parent | 1804da89eea38615a4dd9532757b7ef7c35d2be6 (diff) | |
merge changes for exception handling
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()) { |