diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-04-24 11:25:04 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-04-24 11:25:04 -0400 |
| commit | e6f53dedb704c92af45ede2d97c559cb6639358f (patch) | |
| tree | 200fcb9fb2b24036b3b674f33d42c3be4b93f18a /indra | |
| parent | 6d737c927ccb73f7d0218af14e149969d8cd8338 (diff) | |
MAINT-7343 - Added check for shutdown in progress when asset result arrives
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerassetstorage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp index bb9195fe90..6523b89d7f 100644 --- a/indra/newview/llviewerassetstorage.cpp +++ b/indra/newview/llviewerassetstorage.cpp @@ -458,6 +458,12 @@ void LLViewerAssetStorage::assetRequestCoro( LLSD result = httpAdapter->getRawAndSuspend(httpRequest, url, httpOpts); + if (LLApp::isQuitting()) + { + // Bail out if result arrives after shutdown has been started. + return; + } + LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS]; LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults); if (!status) |