From 3bb00a99e3277828d3c126574e4c676712bcf758 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 12 Apr 2017 16:06:23 -0400
Subject: MAINT-7195 - fixed bug in the wait-for-caps logic. Doesn't really
 matter in practice since the member variable in question still gets set by
 the cap received callback.

---
 indra/newview/llviewerassetstorage.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index d95b104f5c..0ca896ce1a 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -424,12 +424,9 @@ void LLViewerAssetStorage::assetRequestCoro(
         
         llcoro::suspendUntilEventOn(capsRecv);
     }
-    else
+    if (mViewerAssetUrl.empty())
     {
-        if (mViewerAssetUrl.empty())
-        {
-            mViewerAssetUrl = gAgent.getRegion()->getViewerAssetUrl();
-        }
+        mViewerAssetUrl = gAgent.getRegion()->getViewerAssetUrl();
     }
     if (mViewerAssetUrl.empty())
     {
@@ -454,7 +451,6 @@ void LLViewerAssetStorage::assetRequestCoro(
     LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
     if (!status)
     {
-        // TODO asset-http: handle failures
         LL_DEBUGS("ViewerAsset") << "request failed, status " << status.toTerseString() << LL_ENDL;
         result_code = LL_ERR_ASSET_REQUEST_FAILED;
         ext_status = LL_EXSTAT_NONE;
-- 
cgit v1.2.3