diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:41:49 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:41:49 +0000 |
| commit | a0b9fd6eb0dacfec30df0caac8dbbd7c25366c72 (patch) | |
| tree | 229a96783c6534a36ce48bdb83108ce26ac24b2f /indra/llcrashlogger | |
| parent | 2cad61d76ba48fe2adfda120bc21ca66166b7385 (diff) | |
| parent | 10241c5596402a145e4087c36014d84507183c32 (diff) | |
Merged in DV528-merge-6.4.15 (pull request #484)
DRTVWR-528 merge up to 6.4.15
Diffstat (limited to 'indra/llcrashlogger')
| -rw-r--r-- | indra/llcrashlogger/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/llcrashlogger/llcrashlock.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcrashlogger/CMakeLists.txt b/indra/llcrashlogger/CMakeLists.txt index da23b46b7b..d70a1e0fb0 100644 --- a/indra/llcrashlogger/CMakeLists.txt +++ b/indra/llcrashlogger/CMakeLists.txt @@ -7,7 +7,7 @@ include(LLCoreHttp) include(LLCommon) include(LLMath) include(LLMessage) -include(LLVFS) +include(LLFileSystem) include(LLXML) include_directories( @@ -15,7 +15,7 @@ include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS} - ${LLVFS_INCLUDE_DIRS} + ${LLFILESYSTEM_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ) include_directories(SYSTEM diff --git a/indra/llcrashlogger/llcrashlock.h b/indra/llcrashlogger/llcrashlock.h index cde183272f..60b060b736 100644 --- a/indra/llcrashlogger/llcrashlock.h +++ b/indra/llcrashlogger/llcrashlock.h @@ -1,5 +1,5 @@ /** - * @file llpidlock.h + * @file llcrashlock.h * @brief Maintainence of disk locking files for crash reporting * * $LicenseInfo:firstyear=2001&license=viewerlgpl$ |