diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-06-11 14:28:30 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-06-11 14:28:30 +0300 |
| commit | 1b236217560aeb81d5eea5a6b67b1f9896b005a8 (patch) | |
| tree | b69705b8ef9831b4725fa3023626d87ec4b1809a /indra/llcorehttp | |
| parent | 546fc96f01298fe16f1cb0454e65569c77c44090 (diff) | |
| parent | 2761c1c7c2fdb6cbfe610be7e2f4f8753271d36f (diff) | |
Merged lindenlab/viewer-neko into default
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/_httpservice.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp index 49d865cbfa..0b72b53186 100644 --- a/indra/llcorehttp/_httpservice.cpp +++ b/indra/llcorehttp/_httpservice.cpp @@ -95,10 +95,12 @@ HttpService::~HttpService() if (! mThread->timedJoin(250)) { // Failed to join, expect problems ahead so do a hard termination. - mThread->cancel(); + LL_WARNS(LOG_CORE) << "Destroying HttpService with running thread. Expect problems." << LL_NEWLINE + << "State: " << S32(sState) + << " Last policy: " << U32(mLastPolicy) + << LL_ENDL; - LL_WARNS(LOG_CORE) << "Destroying HttpService with running thread. Expect problems." - << LL_ENDL; + mThread->cancel(); } } } |