livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6974 FIXED '[ERROR_MESSAGE]' dialog is shown if try to bulk apload any .txt file

meow-7.2.2
Mnikolenko Productengine 2016-12-01 15:31:39 +02:00
parent 95826232bc
commit 4daba484b0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewerassetupload.cpp
View File

@ -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);