From c83e740ef94e16ba85574454f3138905edecb029 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 8 Mar 2021 13:56:16 +0000
Subject: Revert "Merge branch 'master' of
 https://bitbucket.org/lindenlab/viewer into DRTVWR-519"

This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing
changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
---
 indra/llui/CMakeLists.txt          | 6 +++---
 indra/llui/llviewereventrecorder.h | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/llui')

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"
-- 
cgit v1.2.3