Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index 4c8859a..b9a182c 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -222,7 +222,7 @@ void LLCrashLogger::gatherFiles()
                         trimSLLog(crash_info);
                 }
 
-                mCrashInfo[(*itr).first] = crash_info;
+                mCrashInfo[(*itr).first] = rawstr_to_utf8(crash_info);
         }
 }