livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

master
Brad Payne (Vir Linden) 2017-04-12 16:06:23 -04:00
parent 12957977eb
commit 3bb00a99e3
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewerassetstorage.cpp
View File

@ -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;