summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorrider <rider@lindenlab.com>2015-07-03 09:39:18 -0700
committerrider <rider@lindenlab.com>2015-07-03 09:39:18 -0700
commit99aa00293b1d79eb47cfe2caa85a5740a2959297 (patch)
tree4560a3495c21f70e5edb6210baf887d873ef2c01 /indra/newview
parent6ccd8bb6120be90eccb4e4b482132ed4fc3695af (diff)
Remove ambiguous assignment.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerassetupload.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index cd4e7c33ef..717b14bb72 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
{