From 00dc41381e291bd339f2b87625641e6a2f4a88d0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 10 Aug 2019 18:01:32 +0200 Subject: [PATCH] Fix missing string warnings in mesh upload errors --- indra/newview/llmeshrepository.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 791fe1977f..a9a10339ca 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -819,7 +819,18 @@ void log_upload_error(LLCore::HttpStatus status, const LLSD& content, for (; mav_errors_it != mav_errors.end(); ++mav_errors_it) { std::string mav_details = "Mav_Details_" + *mav_errors_it; - details << "Message: '" << *mav_errors_it << "': " << LLTrans::getString(mav_details) << std::endl << std::endl; + // Details error can be some message already. + //details << "Message: '" << *mav_errors_it << "': " << LLTrans::getString(mav_details) << std::endl << std::endl; + std::string translated_details; + if (LLTrans::findString(translated_details, mav_details)) + { + details << "Message: '" << *mav_errors_it << "': " << translated_details << std::endl << std::endl; + } + else + { + details << "Message: '" << *mav_errors_it << "'" << std::endl << std::endl; + } + // } std::string details_str = details.str();