From 295c8a437afb29be1ec4b59acad60c35afb6ffc3 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 20 Mar 2017 08:12:37 -0400
Subject: MAINT-7195 possible fix

---
 indra/newview/llviewerassetstorage.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra')

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())
     {
-- 
cgit v1.2.3