diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
| commit | fd447189c5e05df53cd8ec0a4168370c03c3bb16 (patch) | |
| tree | 484b5075ff9c977dd29679c87f6eaa08144b292f /indra/mac_crash_logger | |
| parent | b1d608ee99824fde13f3f16e0947ec5b54299fca (diff) | |
| parent | 2dc4f8f8e98da565c158ec9947fe96eccd4920e9 (diff) | |
Merge 3.5.1 into Materials
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 | 32286 -> 32286 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 e9d9e05985..e9d9e05985 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 |