diff options
author | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
commit | 1b984d8f40d805341b8c1fc670c29b32c25ce227 (patch) | |
tree | fb73a6224dfe7ff7d5bf4619a799b0ededffcb64 /indra/llcrashlogger | |
parent | 21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff) | |
parent | 1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff) |
merge changes for 3.5.1-release
Diffstat (limited to 'indra/llcrashlogger')
-rw-r--r-- | indra/llcrashlogger/llcrashlogger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 34e25a8a71..fb2d43e3b0 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -147,7 +147,7 @@ void LLCrashLogger::gatherFiles() // Look for it in the debug_info.log file if (debug_log_file.is_open()) - { + { LLSDSerialize::fromXML(mDebugLog, debug_log_file); mCrashInPreviousExec = mDebugLog["CrashNotHandled"].asBoolean(); |