diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-10-09 14:46:01 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-10-09 14:46:01 -0700 |
| commit | ed7963bad14abd628fa60d0d5baf357f1858c48c (patch) | |
| tree | 7d612803f22edf86de0f3494ecedc2fd93e2dfab | |
| parent | bbe363c301d6dee2c8e8c756b04851fa94851abc (diff) | |
SL-230: Azumarill viewer was incorrectly swallowing upload errors returned from the server. Correctly report errors and use upload cost provided by server.
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index ea3d81c2f6..f0dafec240 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -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) { |