2 files changed, 5 insertions, 10 deletions
diff --git a/indra/llcrashlogger/llcrashlock.cpp b/indra/llcrashlogger/llcrashlock.cpp
index 506232ab2a..bc34f6798f 100644
--- a/indra/llcrashlogger/llcrashlock.cpp
+++ b/indra/llcrashlogger/llcrashlock.cpp
@@ -45,11 +45,10 @@
 
 bool LLCrashLock::isProcessAlive(U32 pid, const std::string& pname)
 {
-    std::wstring wpname;
-    wpname = std::wstring(pname.begin(), pname.end());
+    std::wstring wpname = ll_convert_string_to_wide(pname);
 
     HANDLE snapshot;
-    PROCESSENTRY32 pe32;
+    PROCESSENTRY32 pe32{};
 
     bool matched = false;
 
@@ -65,7 +64,7 @@ bool LLCrashLock::isProcessAlive(U32 pid, const std::string& pname)
         {
             do {
                 std::wstring wexecname = pe32.szExeFile;
-                std::string execname = std::string(wexecname.begin(), wexecname.end());
+                std::string execname = ll_convert_wide_to_string(wexecname);
                 if (!wpname.compare(pe32.szExeFile))
                 {
                     if (pid == (U32)pe32.th32ProcessID)
@@ -190,7 +189,7 @@ LLSD LLCrashLock::getProcessList()
 bool LLCrashLock::fileExists(std::string filename)
 {
 #ifdef LL_WINDOWS // or BOOST_WINDOWS_API
-    boost::filesystem::path file_path(utf8str_to_utf16str(filename));
+    boost::filesystem::path file_path(ll_convert<std::wstring>(filename));
 #else
     boost::filesystem::path file_path(filename);
 #endif
@@ -200,7 +199,7 @@ bool LLCrashLock::fileExists(std::string filename)
 void LLCrashLock::cleanupProcess(std::string proc_dir)
 {
 #ifdef LL_WINDOWS // or BOOST_WINDOWS_API
-    boost::filesystem::path dir_path(utf8str_to_utf16str(proc_dir));
+    boost::filesystem::path dir_path(ll_convert<std::wstring>(proc_dir));
 #else
     boost::filesystem::path dir_path(proc_dir);
 #endif
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index b1b698375a..d5c585b45e 100644
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -576,10 +576,6 @@ bool LLCrashLogger::init()
     std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log.old");
     std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log");
 
-#if LL_WINDOWS
-    LLAPRFile::remove(old_log_file);
-#endif
-
     LLFile::rename(log_file.c_str(), old_log_file.c_str());
 
     // Set the log file to crashreport.log