diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-29 18:26:54 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-29 18:26:54 +0100 |
| commit | ca75963f3faf48697b3bcb15319da1e928df2a45 (patch) | |
| tree | 36f36546d40ffcf035094fe21600d58fe4ac192a /indra/newview/llviewerassetupload.cpp | |
| parent | a27501d21626e0026a184aaf9bc24a22d0f636bb (diff) | |
| parent | 0b3a4c75568a1648926c24463ed11cba53cfddb8 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerassetupload.cpp')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index 555768615a..6a81c312d3 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -735,6 +735,10 @@ void LLViewerAssetUpload::AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCorouti LLUploadDialog::modalUploadFinished(); return; } + if (!result.has("success")) + { + result["success"] = LLSD::Boolean((ulstate == "complete") && status); + } S32 uploadPrice = result["upload_price"].asInteger();//uploadInfo->getEconomyUploadCost(); |