summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetstorage.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-11-16 02:22:54 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-11-16 02:22:54 +0200
commit5ccdcf51a3b4cb46a8c9134636bc3bd5f2129f92 (patch)
treefd0dbaf5b47674beaf7abd159bfec5fcd1428766 /indra/newview/llviewerassetstorage.cpp
parent3641541c6cc7f33f0e0dc2e1eb2cfdfcec23322b (diff)
parent9957c28ddc5e5c129af2db662da7d69f1509af65 (diff)
Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt
Diffstat (limited to 'indra/newview/llviewerassetstorage.cpp')
-rw-r--r--indra/newview/llviewerassetstorage.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index c1b129750a..64d9ce62c5 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -520,6 +520,12 @@ void LLViewerAssetStorage::assetRequestCoro(
boost::bind(&LLViewerAssetStorage::capsRecvForRegion, this, _1, capsRecv.getName()));
llcoro::suspendUntilEventOn(capsRecv);
+
+ if (LLApp::isExiting() || !gAssetStorage)
+ {
+ return;
+ }
+
LL_WARNS_ONCE("ViewerAsset") << "capsRecv got event" << LL_ENDL;
LL_WARNS_ONCE("ViewerAsset") << "region " << gAgent.getRegion() << " mViewerAssetUrl " << mViewerAssetUrl << LL_ENDL;
}