Skip to content
Snippets Groups Projects
Commit 59b9894d authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-13719 One more exit crash for asset storage

parent bbb16ff9
No related branches found
No related tags found
No related merge requests found
...@@ -457,6 +457,11 @@ void LLViewerAssetStorage::assetRequestCoro( ...@@ -457,6 +457,11 @@ void LLViewerAssetStorage::assetRequestCoro(
S32 result_code = LL_ERR_NOERR; S32 result_code = LL_ERR_NOERR;
LLExtStat ext_status = LLExtStat::NONE; 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()) if (!gAgent.getRegion())
{ {
LL_WARNS_ONCE("ViewerAsset") << "Asset request fails: no region set" << LL_ENDL; LL_WARNS_ONCE("ViewerAsset") << "Asset request fails: no region set" << LL_ENDL;
...@@ -501,7 +506,7 @@ void LLViewerAssetStorage::assetRequestCoro( ...@@ -501,7 +506,7 @@ void LLViewerAssetStorage::assetRequestCoro(
LLSD result = httpAdapter->getRawAndSuspend(httpRequest, url, httpOpts); LLSD result = httpAdapter->getRawAndSuspend(httpRequest, url, httpOpts);
if (LLApp::isQuitting()) if (LLApp::isQuitting() || !gAssetStorage)
{ {
// Bail out if result arrives after shutdown has been started. // Bail out if result arrives after shutdown has been started.
return; return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment