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

SL-230: Azumarill viewer was incorrectly swallowing upload errors returned from the server. Correctly report errors and use upload cost provided by server.

meow-7.2.2
Rider Linden 2015-10-09 14:46:01 -07:00
parent bbe363c301
commit ed7963bad1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewerassetupload.cpp
View File

@ -722,7 +722,9 @@ void LLViewerAssetUpload::AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCorouti
httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
if (!status)
std::string ulstate = result["state"].asString();
if ((!status) || (ulstate != "complete"))
{
HandleUploadError(status, result, uploadInfo);
if (uploadInfo->showUploadDialog())
@ -730,7 +732,7 @@ void LLViewerAssetUpload::AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCorouti
return;
}
S32 uploadPrice = uploadInfo->getEconomyUploadCost();
S32 uploadPrice = result["upload_price"].asInteger();//uploadInfo->getEconomyUploadCost();
if (uploadPrice > 0)
{