summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-03-20 08:12:37 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-03-20 08:12:37 -0400
commit295c8a437afb29be1ec4b59acad60c35afb6ffc3 (patch)
tree2e8c39729c4167bf4f2385c9faa2c9e9a42d09eb /indra
parente9c786ec6060da836bf6aa49f0e443f41f41a2c0 (diff)
MAINT-7195 possible fix
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerassetstorage.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 153108d8a9..496fbbecff 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -428,6 +428,11 @@ void LLViewerAssetStorage::queueRequestHttp(
BOOL is_priority)
{
LL_DEBUGS("ViewerAsset") << "Request asset via HTTP " << uuid << " type " << LLAssetType::lookup(atype) << LL_ENDL;
+ if (!gAgent.getRegion())
+ {
+ LL_WARNS() << "No region, fetch fails" << LL_ENDL;
+ return;
+ }
std::string cap_url = gAgent.getRegion()->getCapability("ViewerAsset");
if (cap_url.empty())
{