Second Life viewer sources 1.19.1.0

1 files changed, 6 insertions, 4 deletions

diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index ab464bd..ebd2303 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -119,8 +119,10 @@ void LLCrashLogger::gatherFiles()
         updateApplication("Gathering logs...");
 
         // Figure out the filename of the debug log
-        LLString db_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"debug_info.log").c_str();
-        std::ifstream debug_log_file(db_file_name.c_str());
+        std::string db_file_name = gDirUtilp->getExpandedFilename(
+                LL_PATH_LOGS,
+                "debug_info.log");
+        llifstream debug_log_file(db_file_name.c_str());
 
         // Look for it in the debug_info.log file
         if (debug_log_file.is_open())
@@ -128,14 +130,14 @@ void LLCrashLogger::gatherFiles()
                 LLSDSerialize::fromXML(mDebugLog, debug_log_file);
                 mFileMap["SecondLifeLog"] = mDebugLog["SLLog"].asString();
                 mFileMap["SettingsXml"] = mDebugLog["SettingsFilename"].asString();
-                LLHTTPClient::setCABundle(mDebugLog["CAFilename"].asString());
+                LLCurl::setCAFile(mDebugLog["CAFilename"].asString());
                 llinfos << "Using log file from debug log " << mFileMap["SecondLifeLog"] << llendl;
                 llinfos << "Using settings file from debug log " << mFileMap["SettingsXml"] << llendl;
         }
         else
         {
                 // Figure out the filename of the second life log
-                LLHTTPClient::setCABundle(gDirUtilp->getCAFile());
+                LLCurl::setCAFile(gDirUtilp->getCAFile());
                 mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log");
                 mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
         }