diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-04 20:56:18 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-05 20:07:19 +0300 |
| commit | 59b9894d4c88c30432cfb45c1d295d54ba25d42b (patch) | |
| tree | 0f44b025765a13967dc2b7120d22d5501c4691a4 /indra/newview | |
| parent | bbb16ff97c1dbafa21358dbee8ca686d3c30478e (diff) | |
SL-13719 One more exit crash for asset storage
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerassetstorage.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp index 3c61ce15f1..cacdee7e83 100644 --- a/indra/newview/llviewerassetstorage.cpp +++ b/indra/newview/llviewerassetstorage.cpp @@ -457,6 +457,11 @@ void LLViewerAssetStorage::assetRequestCoro( S32 result_code = LL_ERR_NOERR; LLExtStat ext_status = LLExtStat::NONE; + if (!gAssetStorage) + { + LL_WARNS_ONCE("ViewerAsset") << "Asset request fails: asset storage no longer exists" << LL_ENDL; + return; + } if (!gAgent.getRegion()) { LL_WARNS_ONCE("ViewerAsset") << "Asset request fails: no region set" << LL_ENDL; @@ -501,7 +506,7 @@ void LLViewerAssetStorage::assetRequestCoro( LLSD result = httpAdapter->getRawAndSuspend(httpRequest, url, httpOpts); - if (LLApp::isQuitting()) + if (LLApp::isQuitting() || !gAssetStorage) { // Bail out if result arrives after shutdown has been started. return; |