41 files changed, 79 insertions, 94 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 04279cc887..4b39bfe332 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -40,7 +40,7 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llmath)
 add_subdirectory(${LIBS_OPEN_PREFIX}llmessage)
 add_subdirectory(${LIBS_OPEN_PREFIX}llprimitive)
 add_subdirectory(${LIBS_OPEN_PREFIX}llrender)
-add_subdirectory(${LIBS_OPEN_PREFIX}llcache)
+add_subdirectory(${LIBS_OPEN_PREFIX}llfilesystem)
 add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
 add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
 
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index d464c8ad74..352dfc0641 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -69,7 +69,7 @@ set(cmake_SOURCE_FILES
     LLSharedLibs.cmake
     LLTestCommand.cmake
     LLUI.cmake
-    LLCache.cmake
+    LLFileSystem.cmake
     LLWindow.cmake
     LLXML.cmake
     Linking.cmake
diff --git a/indra/cmake/LLCache.cmake b/indra/cmake/LLCache.cmake
deleted file mode 100644
index 6a82774133..0000000000
--- a/indra/cmake/LLCache.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-set(LLCACHE_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llcache
-    )
-
-set(LLCACHE_LIBRARIES llcache)
diff --git a/indra/cmake/LLFileSystem.cmake b/indra/cmake/LLFileSystem.cmake
new file mode 100644
index 0000000000..2e6c42c30c
--- /dev/null
+++ b/indra/cmake/LLFileSystem.cmake
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+set(LLFILESYSTEM_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llfilesystem
+    )
+
+set(LLFILESYSTEM_LIBRARIES llfilesystem)
diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt
index ff784387dc..268849ad74 100644
--- a/indra/llappearance/CMakeLists.txt
+++ b/indra/llappearance/CMakeLists.txt
@@ -11,7 +11,7 @@ include(LLMath)
 include(LLMessage)
 include(LLCoreHttp)
 include(LLRender)
-include(LLCache)
+include(LLFileSystem)
 include(LLWindow)
 include(LLXML)
 include(Linking)
@@ -23,7 +23,7 @@ include_directories(
     ${LLINVENTORY_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLRENDER_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     )
@@ -83,7 +83,7 @@ target_link_libraries(llappearance
     ${LLINVENTORY_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
     ${LLRENDER_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLXML_LIBRARIES}
     ${LLMATH_LIBRARIES}
@@ -100,7 +100,7 @@ if (BUILD_HEADLESS)
       ${LLINVENTORY_LIBRARIES}
       ${LLIMAGE_LIBRARIES}
       ${LLRENDERHEADLESS_LIBRARIES}
-      ${LLCACHE_LIBRARIES}
+      ${LLFILESYSTEM_LIBRARIES}
       ${LLMATH_LIBRARIES}
       ${LLXML_LIBRARIES}
       ${LLMATH_LIBRARIES}
@@ -109,15 +109,3 @@ if (BUILD_HEADLESS)
       ${LLCOMMON_LIBRARIES}
       )
 endif (BUILD_HEADLESS)
-
-#add unit tests
-#if (LL_TESTS)
-#    INCLUDE(LLAddBuildTest)
-#    SET(llappearance_TEST_SOURCE_FILES
-#      # no real unit tests yet!
-#      )
-#    LL_ADD_PROJECT_UNIT_TESTS(llappearance "${llappearance_TEST_SOURCE_FILES}")
-
-    #set(TEST_DEBUG on)
-#    set(test_libs llappearance ${LLCOMMON_LIBRARIES})
-#endif (LL_TESTS)
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 2498561029..9dcd4d697e 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -9,14 +9,14 @@ include(OPENAL)
 include(LLCommon)
 include(LLMath)
 include(LLMessage)
-include(LLCache)
+include(LLFileSystem)
 
 include_directories(
     ${LLAUDIO_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${OGG_INCLUDE_DIRS}
     ${VORBISENC_INCLUDE_DIRS}
     ${VORBISFILE_INCLUDE_DIRS}
@@ -82,7 +82,7 @@ target_link_libraries(
     ${LLCOMMON_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${VORBISENC_LIBRARIES}
     ${VORBISFILE_LIBRARIES}
     ${VORBIS_LIBRARIES}
diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt
index e236a307c2..d90ffb5543 100644
--- a/indra/llcharacter/CMakeLists.txt
+++ b/indra/llcharacter/CMakeLists.txt
@@ -6,14 +6,14 @@ include(00-Common)
 include(LLCommon)
 include(LLMath)
 include(LLMessage)
-include(LLCache)
+include(LLFileSystem)
 include(LLXML)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     )
 include_directories(SYSTEM
@@ -85,6 +85,6 @@ target_link_libraries(
     ${LLCOMMON_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLXML_LIBRARIES}
     )
diff --git a/indra/llcrashlogger/CMakeLists.txt b/indra/llcrashlogger/CMakeLists.txt
index 040a0e846c..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(LLCache)
+include(LLFileSystem)
 include(LLXML)
 
 include_directories(
@@ -15,7 +15,7 @@ include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     )
 include_directories(SYSTEM
diff --git a/indra/llcache/CMakeLists.txt b/indra/llfilesystem/CMakeLists.txt
index f1e4e7e0a3..4af14d6d3a 100644
--- a/indra/llcache/CMakeLists.txt
+++ b/indra/llfilesystem/CMakeLists.txt
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 
-project(llcache)
+project(llfilesystem)
 
 include(00-Common)
 include(LLCommon)
@@ -11,14 +11,14 @@ include_directories(
     ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
     )
 
-set(llcache_SOURCE_FILES
+set(llfilesystem_SOURCE_FILES
     lldir.cpp
     lldiriterator.cpp
     lllfsthread.cpp
     lldiskcache.cpp
     )
 
-set(llcache_HEADER_FILES
+set(llfilesystem_HEADER_FILES
     CMakeLists.txt
 
     lldir.h
@@ -29,15 +29,15 @@ set(llcache_HEADER_FILES
     )
 
 if (DARWIN)
-  LIST(APPEND llcache_SOURCE_FILES lldir_utils_objc.mm)
-  LIST(APPEND llcache_SOURCE_FILES lldir_utils_objc.h)
-  LIST(APPEND llcache_SOURCE_FILES lldir_mac.cpp)
-  LIST(APPEND llcache_HEADER_FILES lldir_mac.h)
+  LIST(APPEND llfilesystem_SOURCE_FILES lldir_utils_objc.mm)
+  LIST(APPEND llfilesystem_SOURCE_FILES lldir_utils_objc.h)
+  LIST(APPEND llfilesystem_SOURCE_FILES lldir_mac.cpp)
+  LIST(APPEND llfilesystem_HEADER_FILES lldir_mac.h)
 endif (DARWIN)
 
 if (LINUX)
-  LIST(APPEND llcache_SOURCE_FILES lldir_linux.cpp)
-  LIST(APPEND llcache_HEADER_FILES lldir_linux.h)
+  LIST(APPEND llfilesystem_SOURCE_FILES lldir_linux.cpp)
+  LIST(APPEND llfilesystem_HEADER_FILES lldir_linux.h)
 
   if (INSTALL)
     set_source_files_properties(lldir_linux.cpp
@@ -48,23 +48,23 @@ if (LINUX)
 endif (LINUX)
 
 if (WINDOWS)
-  LIST(APPEND llcache_SOURCE_FILES lldir_win32.cpp)
-  LIST(APPEND llcache_HEADER_FILES lldir_win32.h)
+  LIST(APPEND llfilesystem_SOURCE_FILES lldir_win32.cpp)
+  LIST(APPEND llfilesystem_HEADER_FILES lldir_win32.h)
 endif (WINDOWS)
 
-set_source_files_properties(${llcache_HEADER_FILES}
+set_source_files_properties(${llfilesystem_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
-list(APPEND llcache_SOURCE_FILES ${llcache_HEADER_FILES})
+list(APPEND llfilesystem_SOURCE_FILES ${llfilesystem_HEADER_FILES})
 
-add_library (llcache ${llcache_SOURCE_FILES})
+add_library (llfilesystem ${llfilesystem_SOURCE_FILES})
 
 set(cache_BOOST_LIBRARIES
     ${BOOST_FILESYSTEM_LIBRARY}
     ${BOOST_SYSTEM_LIBRARY}
     )
 
-target_link_libraries(llcache
+target_link_libraries(llfilesystem
     ${LLCOMMON_LIBRARIES}
     ${cache_BOOST_LIBRARIES}
     )
@@ -72,7 +72,7 @@ target_link_libraries(llcache
 if (DARWIN)
   include(CMakeFindFrameworks)
   find_library(COCOA_LIBRARY Cocoa)
-  target_link_libraries(llcache ${COCOA_LIBRARY})
+  target_link_libraries(llfilesystem ${COCOA_LIBRARY})
 endif (DARWIN)
 
 
@@ -80,7 +80,7 @@ endif (DARWIN)
 if (LL_TESTS)
     include(LLAddBuildTest)
     # UNIT TESTS
-    SET(llcache_TEST_SOURCE_FILES
+    SET(llfilesystem_TEST_SOURCE_FILES
     lldiriterator.cpp
     )
 
@@ -88,10 +88,10 @@ if (LL_TESTS)
     PROPERTIES
     LL_TEST_ADDITIONAL_LIBRARIES "${cache_BOOST_LIBRARIES}"
     )
-    LL_ADD_PROJECT_UNIT_TESTS(llcache "${llcache_TEST_SOURCE_FILES}")
+    LL_ADD_PROJECT_UNIT_TESTS(llfilesystem "${llfilesystem_TEST_SOURCE_FILES}")
 
     # INTEGRATION TESTS
-    set(test_libs llmath llcommon llcache ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
+    set(test_libs llmath llcommon llfilesystem ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
 
     # TODO: Some of these need refactoring to be proper Unit tests rather than Integration tests.
     LL_ADD_INTEGRATION_TEST(lldir "" "${test_libs}")
diff --git a/indra/llcache/lldir.cpp b/indra/llfilesystem/lldir.cpp
index 10fbc06c61..10fbc06c61 100644
--- a/indra/llcache/lldir.cpp
+++ b/indra/llfilesystem/lldir.cpp
diff --git a/indra/llcache/lldir.h b/indra/llfilesystem/lldir.h
index 38e204ef04..38e204ef04 100644
--- a/indra/llcache/lldir.h
+++ b/indra/llfilesystem/lldir.h
diff --git a/indra/llcache/lldir_linux.cpp b/indra/llfilesystem/lldir_linux.cpp
index 80ad05345a..80ad05345a 100644
--- a/indra/llcache/lldir_linux.cpp
+++ b/indra/llfilesystem/lldir_linux.cpp
diff --git a/indra/llcache/lldir_linux.h b/indra/llfilesystem/lldir_linux.h
index e83a020ba4..e83a020ba4 100644
--- a/indra/llcache/lldir_linux.h
+++ b/indra/llfilesystem/lldir_linux.h
diff --git a/indra/llcache/lldir_mac.cpp b/indra/llfilesystem/lldir_mac.cpp
index 3bc4ee844e..3bc4ee844e 100644
--- a/indra/llcache/lldir_mac.cpp
+++ b/indra/llfilesystem/lldir_mac.cpp
diff --git a/indra/llcache/lldir_mac.h b/indra/llfilesystem/lldir_mac.h
index 558727ebbc..558727ebbc 100644
--- a/indra/llcache/lldir_mac.h
+++ b/indra/llfilesystem/lldir_mac.h
diff --git a/indra/llcache/lldir_solaris.cpp b/indra/llfilesystem/lldir_solaris.cpp
index f18560ff20..f18560ff20 100644
--- a/indra/llcache/lldir_solaris.cpp
+++ b/indra/llfilesystem/lldir_solaris.cpp
diff --git a/indra/llcache/lldir_solaris.h b/indra/llfilesystem/lldir_solaris.h
index c6dac57e14..c6dac57e14 100644
--- a/indra/llcache/lldir_solaris.h
+++ b/indra/llfilesystem/lldir_solaris.h
diff --git a/indra/llcache/lldir_utils_objc.h b/indra/llfilesystem/lldir_utils_objc.h
index 12019c4284..12019c4284 100644
--- a/indra/llcache/lldir_utils_objc.h
+++ b/indra/llfilesystem/lldir_utils_objc.h
diff --git a/indra/llcache/lldir_utils_objc.mm b/indra/llfilesystem/lldir_utils_objc.mm
index da55a2f897..da55a2f897 100644
--- a/indra/llcache/lldir_utils_objc.mm
+++ b/indra/llfilesystem/lldir_utils_objc.mm
diff --git a/indra/llcache/lldir_win32.cpp b/indra/llfilesystem/lldir_win32.cpp
index b3b3afb37e..b3b3afb37e 100644
--- a/indra/llcache/lldir_win32.cpp
+++ b/indra/llfilesystem/lldir_win32.cpp
diff --git a/indra/llcache/lldir_win32.h b/indra/llfilesystem/lldir_win32.h
index 450efaf9da..450efaf9da 100644
--- a/indra/llcache/lldir_win32.h
+++ b/indra/llfilesystem/lldir_win32.h
diff --git a/indra/llcache/lldirguard.h b/indra/llfilesystem/lldirguard.h
index 37b9e9b83e..37b9e9b83e 100644
--- a/indra/llcache/lldirguard.h
+++ b/indra/llfilesystem/lldirguard.h
diff --git a/indra/llcache/lldiriterator.cpp b/indra/llfilesystem/lldiriterator.cpp
index 3eb64e69d9..3eb64e69d9 100644
--- a/indra/llcache/lldiriterator.cpp
+++ b/indra/llfilesystem/lldiriterator.cpp
diff --git a/indra/llcache/lldiriterator.h b/indra/llfilesystem/lldiriterator.h
index 0b48be41b3..0b48be41b3 100644
--- a/indra/llcache/lldiriterator.h
+++ b/indra/llfilesystem/lldiriterator.h
diff --git a/indra/llcache/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp
index af93049e07..af93049e07 100644
--- a/indra/llcache/lldiskcache.cpp
+++ b/indra/llfilesystem/lldiskcache.cpp
diff --git a/indra/llcache/lldiskcache.h b/indra/llfilesystem/lldiskcache.h
index 7ad06a8689..7ad06a8689 100644
--- a/indra/llcache/lldiskcache.h
+++ b/indra/llfilesystem/lldiskcache.h
diff --git a/indra/llcache/lllfsthread.cpp b/indra/llfilesystem/lllfsthread.cpp
index be8e83a56f..be8e83a56f 100644
--- a/indra/llcache/lllfsthread.cpp
+++ b/indra/llfilesystem/lllfsthread.cpp
diff --git a/indra/llcache/lllfsthread.h b/indra/llfilesystem/lllfsthread.h
index 58f658f7ba..58f658f7ba 100644
--- a/indra/llcache/lllfsthread.h
+++ b/indra/llfilesystem/lllfsthread.h
diff --git a/indra/llcache/tests/lldir_test.cpp b/indra/llfilesystem/tests/lldir_test.cpp
index 3cff622a4b..3cff622a4b 100644
--- a/indra/llcache/tests/lldir_test.cpp
+++ b/indra/llfilesystem/tests/lldir_test.cpp
diff --git a/indra/llcache/tests/lldiriterator_test.cpp b/indra/llfilesystem/tests/lldiriterator_test.cpp
index a65e3dada5..a65e3dada5 100644
--- a/indra/llcache/tests/lldiriterator_test.cpp
+++ b/indra/llfilesystem/tests/lldiriterator_test.cpp
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index 1f6b981346..dc8e9f7c2f 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -6,7 +6,7 @@ include(00-Common)
 include(LLCommon)
 include(LLImage)
 include(LLMath)
-include(LLCache)
+include(LLFileSystem)
 include(LLKDU)
 include(LLImageJ2COJ)
 include(ZLIB)
@@ -17,7 +17,7 @@ include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${PNG_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIRS}
     )
@@ -68,7 +68,7 @@ else (USE_KDU)
 endif (USE_KDU)
 
 target_link_libraries(llimage
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     ${JPEG_LIBRARIES}
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt
index ba9f8af390..04975940aa 100644
--- a/indra/llinventory/CMakeLists.txt
+++ b/indra/llinventory/CMakeLists.txt
@@ -7,7 +7,7 @@ include(LLCommon)
 include(LLCoreHttp)
 include(LLMath)
 include(LLMessage)
-include(LLCache)
+include(LLFileSystem)
 include(LLXML)
 
 include_directories(
@@ -81,7 +81,7 @@ if (LL_TESTS)
     LL_ADD_PROJECT_UNIT_TESTS(llinventory "${llinventory_TEST_SOURCE_FILES}")
 
     #set(TEST_DEBUG on)
-    set(test_libs llinventory ${LLMESSAGE_LIBRARIES} ${LLCACHE_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
+    set(test_libs llinventory ${LLMESSAGE_LIBRARIES} ${LLFILESYSTEM_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
     LL_ADD_INTEGRATION_TEST(inventorymisc "" "${test_libs}")
     LL_ADD_INTEGRATION_TEST(llparcel "" "${test_libs}")
 endif (LL_TESTS)
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 66a7d3ea04..f0a1dfe940 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -9,7 +9,7 @@ include(LLCommon)
 include(LLCoreHttp)
 include(LLMath)
 include(LLMessage)
-include(LLCache)
+include(LLFileSystem)
 include(LLAddBuildTest)
 include(Python)
 include(Tut)
@@ -23,7 +23,7 @@ include_directories(
     ${LLCOREHTTP_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${JSONCPP_INCLUDE_DIR}
     )
 
@@ -209,7 +209,7 @@ target_link_libraries(
   llmessage
   ${CURL_LIBRARIES}
   ${LLCOMMON_LIBRARIES}
-  ${LLCACHE_LIBRARIES}
+  ${LLFILESYSTEM_LIBRARIES}
   ${LLMATH_LIBRARIES}
   ${JSONCPP_LIBRARIES}
   ${OPENSSL_LIBRARIES}
@@ -227,7 +227,7 @@ target_link_libraries(
   llmessage
   ${CURL_LIBRARIES}
   ${LLCOMMON_LIBRARIES}
-  ${LLCACHE_LIBRARIES}
+  ${LLFILESYSTEM_LIBRARIES}
   ${LLMATH_LIBRARIES}
   ${JSONCPP_LIBRARIES}
   ${OPENSSL_LIBRARIES}
@@ -257,7 +257,7 @@ if (LL_TESTS)
 if (LINUX)
   set(test_libs
     ${WINDOWS_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${CURL_LIBRARIES}
     ${NGHTTP2_LIBRARIES}
@@ -273,7 +273,7 @@ if (LINUX)
 else (LINUX)
   set(test_libs
     ${WINDOWS_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${CURL_LIBRARIES}
     ${NGHTTP2_LIBRARIES}
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index 524e2a1729..baab09a104 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -11,7 +11,7 @@ include(LLMath)
 include(LLRender)
 include(LLWindow)
 include(LLXML)
-include(LLCache)
+include(LLFileSystem)
 
 include_directories(
     ${FREETYPE_INCLUDE_DIRS}
@@ -19,10 +19,9 @@ include_directories(
     ${LLIMAGE_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLRENDER_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
     )
 include_directories(SYSTEM
     ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
@@ -103,9 +102,8 @@ if (BUILD_HEADLESS)
     ${LLIMAGE_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLRENDER_HEADLESS_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
     ${LLXML_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLWINDOW_HEADLESS_LIBRARIES}
     ${OPENGL_HEADLESS_LIBRARIES})
 
@@ -125,7 +123,7 @@ target_link_libraries(llrender
     ${LLCOMMON_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
     ${LLMATH_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLXML_LIBRARIES}
     ${LLWINDOW_LIBRARIES}
     ${FREETYPE_LIBRARIES}
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 02020b19c6..7401e6130a 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -13,7 +13,7 @@ include(LLCoreHttp)
 include(LLRender)
 include(LLWindow)
 include(LLCoreHttp)
-include(LLCache)
+include(LLFileSystem)
 include(LLXML)
 
 include_directories(
@@ -25,7 +25,7 @@ include_directories(
     ${LLMESSAGE_INCLUDE_DIRS}
     ${LLRENDER_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     ${LIBS_PREBUILD_DIR}/include/hunspell
     )
@@ -283,7 +283,7 @@ target_link_libraries(llui
     ${LLINVENTORY_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
     ${LLCOREHTTP_LIBRARIES}
-    ${LLCACHE_LIBRARIES}    # ugh, just for LLDir
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLXUIXML_LIBRARIES}
     ${LLXML_LIBRARIES}
     ${LLMATH_LIBRARIES}
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 5603c2f322..70eb99c86c 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -16,7 +16,7 @@ include(LLCommon)
 include(LLImage)
 include(LLMath)
 include(LLRender)
-include(LLCache)
+include(LLFileSystem)
 include(LLWindow)
 include(LLXML)
 include(UI)
@@ -26,7 +26,7 @@ include_directories(
     ${LLIMAGE_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLRENDER_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     )
@@ -72,7 +72,7 @@ if (LINUX)
       ${LLIMAGE_LIBRARIES}
       ${LLMATH_LIBRARIES}
       ${LLRENDER_LIBRARIES}
-      ${LLCACHE_LIBRARIES}
+      ${LLFILESYSTEM_LIBRARIES}
       ${LLWINDOW_LIBRARIES}
       ${LLXML_LIBRARIES}
       ${UI_LIBRARIES}     # for GTK
@@ -95,7 +95,7 @@ if (LINUX)
         ${LLIMAGE_LIBRARIES}
         ${LLMATH_LIBRARIES}
         ${LLRENDER_HEADLESS_LIBRARIES}
-        ${LLCACHE_LIBRARIES}
+        ${LLFILESYSTEM_LIBRARIES}
         ${LLWINDOW_HEADLESS_LIBRARIES}
         ${LLXML_LIBRARIES}
         fontconfig          # For FCInit and other FC* functions.
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index e2c6026496..3a7a54e51d 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -5,13 +5,13 @@ project(llxml)
 include(00-Common)
 include(LLCommon)
 include(LLMath)
-include(LLCache)
+include(LLFileSystem)
 include(LLXML)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     )
 include_directories(
     ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
@@ -42,7 +42,7 @@ add_library (llxml ${llxml_SOURCE_FILES})
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
 target_link_libraries( llxml
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     ${EXPAT_LIBRARIES}
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
index 4a10076e6e..75621d7b75 100644
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
@@ -8,7 +8,7 @@ include(LLCoreHttp)
 include(LLCrashLogger)
 include(LLMath)
 include(LLMessage)
-include(LLCache)
+include(LLFilesystem)
 include(LLXML)
 include(Linking)
 include(LLSharedLibs)
@@ -19,7 +19,7 @@ include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLCRASHLOGGER_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     )
 include_directories(SYSTEM
@@ -68,7 +68,7 @@ find_library(COCOA_LIBRARY Cocoa)
 
 target_link_libraries(mac-crash-logger
     ${LLCRASHLOGGER_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${COCOA_LIBRARIES}
     ${LLXML_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index ccf7ad675f..cda2672e12 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -39,7 +39,7 @@ include(LLPlugin)
 include(LLPrimitive)
 include(LLRender)
 include(LLUI)
-include(LLCache)
+include(LLFileSystem)
 include(LLWindow)
 include(LLXML)
 include(NDOF)
@@ -84,7 +84,7 @@ include_directories(
     ${LLPRIMITIVE_INCLUDE_DIRS}
     ${LLRENDER_INCLUDE_DIRS}
     ${LLUI_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     ${LLLOGIN_INCLUDE_DIRS}
@@ -1995,7 +1995,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${LLRENDER_LIBRARIES}
     ${FREETYPE_LIBRARIES}
     ${LLUI_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLWINDOW_LIBRARIES}
     ${LLXML_LIBRARIES}
     ${LLMATH_LIBRARIES}
@@ -2467,7 +2467,7 @@ if (LL_TESTS)
   set(test_libs
     ${LLMESSAGE_LIBRARIES}
     ${WINDOWS_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     ${GOOGLEMOCK_LIBRARIES}
@@ -2482,7 +2482,7 @@ if (LL_TESTS)
 
   set(test_libs
     ${WINDOWS_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index f8e701794c..b3bff3611a 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -8,12 +8,11 @@ include(LLCoreHttp)
 include(LLInventory)
 include(LLMath)
 include(LLMessage)
-include(LLCache)
+include(LLFileSystem)
 include(LLXML)
 include(Linking)
 include(Tut)
 include(LLAddBuildTest)
-
 include(GoogleMock)
 
 include_directories(
@@ -23,7 +22,7 @@ include_directories(
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
     ${LLINVENTORY_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}
     ${GOOGLEMOCK_INCLUDE_DIRS}
@@ -89,7 +88,7 @@ target_link_libraries(lltest
     ${LLINVENTORY_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
     ${LLMATH_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLXML_LIBRARIES}
     ${LSCRIPT_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 811ec00a3d..1b187d624a 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -8,7 +8,7 @@ include(LLCoreHttp)
 include(LLCrashLogger)
 include(LLMath)
 include(LLMessage)
-include(LLCache)
+include(LLFileSystem)
 include(LLWindow)
 include(LLXML)
 include(Linking)
@@ -23,7 +23,7 @@ include_directories(
     ${LLMATH_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
-    ${LLCACHE_INCLUDE_DIRS}
+    ${LLFILESYSTEM_INCLUDE_DIRS}
     ${BREAKPAD_INCLUDE_DIRECTORIES}
     )
 include_directories(SYSTEM
@@ -76,7 +76,7 @@ target_link_libraries(windows-crash-logger
     ${BREAKPAD_EXCEPTION_HANDLER_LIBRARIES}
     ${LLCRASHLOGGER_LIBRARIES}
     ${LLWINDOW_LIBRARIES}
-    ${LLCACHE_LIBRARIES}
+    ${LLFILESYSTEM_LIBRARIES}
     ${LLXML_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
     ${LLMATH_LIBRARIES}