summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-02 01:29:20 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-10-02 01:30:30 +0300
commit47993954923cab94a6b93ce605e0c71d007076f7 (patch)
treec43ac37aba407958bffb5e5d85d8c39c5f310a9a
parent25e0ab207784d681987bb83e37a2570b0b5d4bdd (diff)
SL-16106 Fixed asset storage trying to request data on shutdown
-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;
}