From 99aa00293b1d79eb47cfe2caa85a5740a2959297 Mon Sep 17 00:00:00 2001
From: rider <rider@lindenlab.com>
Date: Fri, 3 Jul 2015 09:39:18 -0700
Subject: Remove ambiguous assignment.

---
 indra/newview/llviewerassetupload.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

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
     {
-- 
cgit v1.2.3