diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-20 09:08:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-20 09:08:20 -0400 |
| commit | 72e7269da376d660385f3c66ac2a25a5e50871ea (patch) | |
| tree | 047bd9d1bf99fa8c308c379dd57758050aa5ef51 /indra/mac_crash_logger | |
| parent | 621085d553cccc4238d74886ca44bcefafddd7f1 (diff) | |
| parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) | |
merge changes for 3.5.2-release
Diffstat (limited to 'indra/mac_crash_logger')
| -rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/CrashReporter.nib | bin | 32288 -> 32288 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/CrashReporter.xib | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/Info.plist | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/llcrashloggermac.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/llcrashloggermac.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/llcrashloggermacdelegate.h | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/llcrashloggermacdelegate.mm | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/mac_crash_logger/mac_crash_logger.cpp | 0 |
9 files changed, 4 insertions, 0 deletions
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt index 3906a3bb8c..c59645bd70 100644..100755 --- a/indra/mac_crash_logger/CMakeLists.txt +++ b/indra/mac_crash_logger/CMakeLists.txt @@ -19,6 +19,10 @@ include_directories( ${LLVFS_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ) +include_directories(SYSTEM + ${LLCOMMON_SYSTEM_INCLUDE_DIRS} + ${LLXML_SYSTEM_INCLUDE_DIRS} + ) set(mac_crash_logger_SOURCE_FILES mac_crash_logger.cpp diff --git a/indra/mac_crash_logger/CrashReporter.nib b/indra/mac_crash_logger/CrashReporter.nib Binary files differindex a30d8d205c..a30d8d205c 100644..100755 --- a/indra/mac_crash_logger/CrashReporter.nib +++ b/indra/mac_crash_logger/CrashReporter.nib diff --git a/indra/mac_crash_logger/CrashReporter.xib b/indra/mac_crash_logger/CrashReporter.xib index f6d4776d51..f6d4776d51 100644..100755 --- a/indra/mac_crash_logger/CrashReporter.xib +++ b/indra/mac_crash_logger/CrashReporter.xib diff --git a/indra/mac_crash_logger/Info.plist b/indra/mac_crash_logger/Info.plist index 2ebed11c3f..2ebed11c3f 100644..100755 --- a/indra/mac_crash_logger/Info.plist +++ b/indra/mac_crash_logger/Info.plist diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp index c5f660ca6e..c5f660ca6e 100644..100755 --- a/indra/mac_crash_logger/llcrashloggermac.cpp +++ b/indra/mac_crash_logger/llcrashloggermac.cpp diff --git a/indra/mac_crash_logger/llcrashloggermac.h b/indra/mac_crash_logger/llcrashloggermac.h index 6d8f63ecac..6d8f63ecac 100644..100755 --- a/indra/mac_crash_logger/llcrashloggermac.h +++ b/indra/mac_crash_logger/llcrashloggermac.h diff --git a/indra/mac_crash_logger/llcrashloggermacdelegate.h b/indra/mac_crash_logger/llcrashloggermacdelegate.h index c998a8efe2..c998a8efe2 100644..100755 --- a/indra/mac_crash_logger/llcrashloggermacdelegate.h +++ b/indra/mac_crash_logger/llcrashloggermacdelegate.h diff --git a/indra/mac_crash_logger/llcrashloggermacdelegate.mm b/indra/mac_crash_logger/llcrashloggermacdelegate.mm index b2af76a47c..b2af76a47c 100644..100755 --- a/indra/mac_crash_logger/llcrashloggermacdelegate.mm +++ b/indra/mac_crash_logger/llcrashloggermacdelegate.mm diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 6add74556f..6add74556f 100644..100755 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp |