diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
| commit | 73f474d886d2430db3d5c8f7729f769b389730a4 (patch) | |
| tree | 5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /indra/linux_crash_logger | |
| parent | 81ffd3fccac709a5903dd0d7572db50c50850347 (diff) | |
| parent | 180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff) | |
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
Diffstat (limited to 'indra/linux_crash_logger')
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/linux_crash_logger.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/llcrashloggerlinux.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/llcrashloggerlinux.h | 0 |
4 files changed, 1 insertions, 0 deletions
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index 9e8c9a1ac6..41b92b00e0 100644..100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -20,6 +20,7 @@ include_directories( ${LLMATH_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} + ${FREETYPE_INCLUDE_DIRS} ) include_directories(SYSTEM ${LLCOMMON_SYSTEM_INCLUDE_DIRS} diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 99d0ad7e14..99d0ad7e14 100644..100755 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp index 62465f9937..62465f9937 100644..100755 --- a/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp diff --git a/indra/linux_crash_logger/llcrashloggerlinux.h b/indra/linux_crash_logger/llcrashloggerlinux.h index dae6c46651..dae6c46651 100644..100755 --- a/indra/linux_crash_logger/llcrashloggerlinux.h +++ b/indra/linux_crash_logger/llcrashloggerlinux.h |