diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-12-01 15:31:39 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-12-01 15:31:39 +0200 |
| commit | 4daba484b02479a7d7ef503832ad2fa6869d2fdb (patch) | |
| tree | b84da5e5458051bfabab9e7ae28f6c26be382a04 /indra/newview/llviewerassetupload.cpp | |
| parent | 95826232bc7c8c695021a21eb79087e573635f24 (diff) | |
MAINT-6974 FIXED '[ERROR_MESSAGE]' dialog is shown if try to bulk apload any .txt file
Diffstat (limited to 'indra/newview/llviewerassetupload.cpp')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index 4271b20ad6..cafaf8645a 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -824,8 +824,15 @@ void LLViewerAssetUpload::HandleUploadError(LLCore::HttpStatus status, LLSD &res } LLSD args; - args["FILE"] = uploadInfo->getDisplayName(); - args["REASON"] = reason; + if(label == "ErrorMessage") + { + args["ERROR_MESSAGE"] = reason; + } + else + { + args["FILE"] = uploadInfo->getDisplayName(); + args["REASON"] = reason; + } LLNotificationsUtil::add(label, args); |