diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-21 13:03:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-21 13:03:04 -0400 |
| commit | 3238cebcb098cfb36aeeee37a7498d569ab04955 (patch) | |
| tree | 4459c297533a53bc93dfb11316552805c3ff4500 /indra/llcommon/llerrorthread.cpp | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | cabb6b6a5f339a69fec25b836f46b8b470eebb90 (diff) | |
Automated merge with http://hg.secondlife.com/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(); |