aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterreporter.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-28 17:21:23 -0500
committerJacek Antonelli2008-09-28 17:21:46 -0500
commit31e7c77a411d94bc87f0232588b339149bb29a49 (patch)
tree49e487700e91713e620e4d33f20b7f7afb5a2fa9 /linden/indra/newview/llfloaterreporter.cpp
parentSecond Life viewer sources 1.21.2-RC (diff)
downloadmeta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.zip
meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.gz
meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.bz2
meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.xz
Second Life viewer sources 1.21.3-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterreporter.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 3a9829d..78f5623 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -937,11 +937,12 @@ void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data,
937 if(result < 0) 937 if(result < 0)
938 { 938 {
939 LLStringUtil::format_map_t args; 939 LLStringUtil::format_map_t args;
940 args["[REASON]"] = std::string(LLAssetStorage::getErrorString(result)); 940 std::string reason = std::string(LLAssetStorage::getErrorString(result));
941 args["[REASON]"] = reason;
941 gViewerWindow->alertXml("ErrorUploadingReportScreenshot", args); 942 gViewerWindow->alertXml("ErrorUploadingReportScreenshot", args);
942 943
943 std::string err_msg("There was a problem uploading a report screenshot"); 944 std::string err_msg("There was a problem uploading a report screenshot");
944 err_msg += " due to the following reason: " + args["[REASON]"]; 945 err_msg += " due to the following reason: " + reason;
945 llwarns << err_msg << llendl; 946 llwarns << err_msg << llendl;
946 return; 947 return;
947 } 948 }