diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:27:21 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:34:16 -0700 |
| commit | 303feae305eb526d75b7d9c8b640407cb8003469 (patch) | |
| tree | 0e322ed210d9600530f0d916fbb18f8330e6aee7 /indra/llui | |
| parent | 9fdd1582774a928242b7fec91bbd951b123296e8 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' v6.4.17 into DRTVWR-525
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | indra/llui/llviewereventrecorder.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt index 7401e6130a..cce618487b 100644 --- a/indra/llui/CMakeLists.txt +++ b/indra/llui/CMakeLists.txt @@ -13,7 +13,7 @@ include(LLCoreHttp) include(LLRender) include(LLWindow) include(LLCoreHttp) -include(LLFileSystem) +include(LLVFS) include(LLXML) include_directories( @@ -25,7 +25,7 @@ include_directories( ${LLMESSAGE_INCLUDE_DIRS} ${LLRENDER_INCLUDE_DIRS} ${LLWINDOW_INCLUDE_DIRS} - ${LLFILESYSTEM_INCLUDE_DIRS} + ${LLVFS_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ${LIBS_PREBUILD_DIR}/include/hunspell ) @@ -283,7 +283,7 @@ target_link_libraries(llui ${LLINVENTORY_LIBRARIES} ${LLMESSAGE_LIBRARIES} ${LLCOREHTTP_LIBRARIES} - ${LLFILESYSTEM_LIBRARIES} + ${LLVFS_LIBRARIES} # ugh, just for LLDir ${LLXUIXML_LIBRARIES} ${LLXML_LIBRARIES} ${LLMATH_LIBRARIES} diff --git a/indra/llui/llviewereventrecorder.h b/indra/llui/llviewereventrecorder.h index 94e66f5dc4..d1059d55de 100644 --- a/indra/llui/llviewereventrecorder.h +++ b/indra/llui/llviewereventrecorder.h @@ -32,6 +32,7 @@ #include "lldir.h" #include "llsd.h" #include "llfile.h" +#include "llvfile.h" #include "lldate.h" #include "llsdserialize.h" #include "llkeyboard.h" |