diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
| commit | 2268bf38339178f93b317693c0a6808807301d64 (patch) | |
| tree | 0a17c21975babce8422b9b62a1683947f5a58f2c /indra/llcrashlogger | |
| parent | d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/llcrashlogger')
| -rwxr-xr-x[-rw-r--r--] | indra/llcrashlogger/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llcrashlogger/llcrashlogger.cpp | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/llcrashlogger/llcrashlogger.h | 0 |
3 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcrashlogger/CMakeLists.txt b/indra/llcrashlogger/CMakeLists.txt index b2639aec30..12986de8b2 100644..100755 --- a/indra/llcrashlogger/CMakeLists.txt +++ b/indra/llcrashlogger/CMakeLists.txt @@ -16,6 +16,10 @@ include_directories( ${LLVFS_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ) +include_directories(SYSTEM + ${LLCOMMON_SYSTEM_INCLUDE_DIRS} + ${LLXML_SYSTEM_INCLUDE_DIRS} + ) set(llcrashlogger_SOURCE_FILES llcrashlogger.cpp diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 34e25a8a71..fb2d43e3b0 100644..100755 --- 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(); diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h index 1510d7e0b3..1510d7e0b3 100644..100755 --- a/indra/llcrashlogger/llcrashlogger.h +++ b/indra/llcrashlogger/llcrashlogger.h |