diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-22 18:59:31 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-22 18:59:31 -0700 |
| commit | 6e710333e7ea08a79c401ae54d063d8ef608f99a (patch) | |
| tree | ff0dbcf29032ff9da18c8d86be7dd622ed180583 /indra/llcommon/llerrorthread.cpp | |
| parent | 7cc44fb7fe40706e2017343d76ed226f477dad8d (diff) | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/llcommon/llerrorthread.cpp')
| -rw-r--r-- | indra/llcommon/llerrorthread.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llcommon/llerrorthread.cpp b/indra/llcommon/llerrorthread.cpp index 902eaa3b72..950fcd6e83 100644 --- a/indra/llcommon/llerrorthread.cpp +++ b/indra/llcommon/llerrorthread.cpp @@ -112,13 +112,8 @@ void LLErrorThread::run() #if !LL_WINDOWS U32 last_sig_child_count = 0; #endif - while (1) + while (! (LLApp::isError() || LLApp::isStopped())) { - if (LLApp::isError() || LLApp::isStopped()) - { - // The application has stopped running, time to take action (maybe) - break; - } #if !LL_WINDOWS // Check whether or not the main thread had a sig child we haven't handled. U32 current_sig_child_count = LLApp::getSigChildCount(); |