summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerrorthread.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-27 11:33:19 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-27 11:33:19 -0400
commit1f234f8593cb556d6515b7bbf3ac99d19fa4c5c3 (patch)
tree16d26c0c5af67114eec8f91a853cc5e0356b4131 /indra/llcommon/llerrorthread.cpp
parent99c1c64aa494c0b9085f0766b951fedfb60ce412 (diff)
parent0730b24d7cb0a0ce0d6d08bc4e98387124bf03d0 (diff)
merge
Diffstat (limited to 'indra/llcommon/llerrorthread.cpp')
-rw-r--r--indra/llcommon/llerrorthread.cpp7
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();