Second Life viewer sources 1.20.11

1 files changed, 9 insertions, 1 deletions

diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index 0fd8f63..306046a 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -158,7 +158,15 @@ void LLCrashLogger::gatherFiles()
                 LLSDSerialize::fromXML(mDebugLog, debug_log_file);
                 mFileMap["SecondLifeLog"] = mDebugLog["SLLog"].asString();
                 mFileMap["SettingsXml"] = mDebugLog["SettingsFilename"].asString();
-                LLCurl::setCAFile(mDebugLog["CAFilename"].asString());
+                if(mDebugLog.has("CAFilename"))
+                {
+                        LLCurl::setCAFile(mDebugLog["CAFilename"].asString());
+                }
+                else
+                {
+                        LLCurl::setCAFile(gDirUtilp->getCAFile());
+                }
+
                 llinfos << "Using log file from debug log " << mFileMap["SecondLifeLog"] << llendl;
                 llinfos << "Using settings file from debug log " << mFileMap["SettingsXml"] << llendl;
         }