diff options
Diffstat (limited to 'linden/indra/llcrashlogger/llcrashlogger.cpp')
-rwxr-xr-x | linden/indra/llcrashlogger/llcrashlogger.cpp | 10 |
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() | |||
158 | LLSDSerialize::fromXML(mDebugLog, debug_log_file); | 158 | LLSDSerialize::fromXML(mDebugLog, debug_log_file); |
159 | mFileMap["SecondLifeLog"] = mDebugLog["SLLog"].asString(); | 159 | mFileMap["SecondLifeLog"] = mDebugLog["SLLog"].asString(); |
160 | mFileMap["SettingsXml"] = mDebugLog["SettingsFilename"].asString(); | 160 | mFileMap["SettingsXml"] = mDebugLog["SettingsFilename"].asString(); |
161 | LLCurl::setCAFile(mDebugLog["CAFilename"].asString()); | 161 | if(mDebugLog.has("CAFilename")) |
162 | { | ||
163 | LLCurl::setCAFile(mDebugLog["CAFilename"].asString()); | ||
164 | } | ||
165 | else | ||
166 | { | ||
167 | LLCurl::setCAFile(gDirUtilp->getCAFile()); | ||
168 | } | ||
169 | |||
162 | llinfos << "Using log file from debug log " << mFileMap["SecondLifeLog"] << llendl; | 170 | llinfos << "Using log file from debug log " << mFileMap["SecondLifeLog"] << llendl; |
163 | llinfos << "Using settings file from debug log " << mFileMap["SettingsXml"] << llendl; | 171 | llinfos << "Using settings file from debug log " << mFileMap["SettingsXml"] << llendl; |
164 | } | 172 | } |