diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-07-07 11:44:15 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-07-07 11:44:15 -0700 |
| commit | b34163be5e675de8d19d3f06c7ae99a14d4b5129 (patch) | |
| tree | cc6a2509a4a5f844ede8958effd689a9d44c1be1 /indra/newview/llviewerassetupload.cpp | |
| parent | 247eb0c9c3418c10be8f2a0e3c8116758efa702f (diff) | |
| parent | d8c02a2838fc426e0e41868aa3b2f43925a14733 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerassetupload.cpp')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index e2394e20d5..d9a17c5bae 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -163,12 +163,12 @@ void LLViewerAssetUpload::HandleUploadError(LLCore::HttpStatus status, LLSD &res if (result.has("label")) { - label = result["label"]; + label = result["label"].asString(); } if (result.has("message")) { - reason = result["message"]; + reason = result["message"].asString(); } else { |