From 3fc07dea01795b31c37dcd093ec73d190a1e188a Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Wed, 16 Sep 2020 18:53:24 -0700
Subject: First part of change to remove LLVFS from the Viewer. Consists of
code changes to remove LLVFS and LLVFSThread classes along with the
associated source files. The existing llvfs folder is renamed to llcache.
Also includes changes to CMake script in many places to reflect changes.
Eventually, llvfile source file and class will be renamed but that is not in
this change.
---
indra/llappearance/CMakeLists.txt | 8 ++++----
indra/llappearance/lltexlayer.cpp | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
(limited to 'indra/llappearance')
diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt
index 20eb4678dd..ff784387dc 100644
--- a/indra/llappearance/CMakeLists.txt
+++ b/indra/llappearance/CMakeLists.txt
@@ -11,7 +11,7 @@ include(LLMath)
include(LLMessage)
include(LLCoreHttp)
include(LLRender)
-include(LLVFS)
+include(LLCache)
include(LLWindow)
include(LLXML)
include(Linking)
@@ -23,7 +23,7 @@ include_directories(
${LLINVENTORY_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
- ${LLVFS_INCLUDE_DIRS}
+ ${LLCACHE_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
@@ -83,7 +83,7 @@ target_link_libraries(llappearance
${LLINVENTORY_LIBRARIES}
${LLIMAGE_LIBRARIES}
${LLRENDER_LIBRARIES}
- ${LLVFS_LIBRARIES}
+ ${LLCACHE_LIBRARIES}
${LLMATH_LIBRARIES}
${LLXML_LIBRARIES}
${LLMATH_LIBRARIES}
@@ -100,7 +100,7 @@ if (BUILD_HEADLESS)
${LLINVENTORY_LIBRARIES}
${LLIMAGE_LIBRARIES}
${LLRENDERHEADLESS_LIBRARIES}
- ${LLVFS_LIBRARIES}
+ ${LLCACHE_LIBRARIES}
${LLMATH_LIBRARIES}
${LLXML_LIBRARIES}
${LLMATH_LIBRARIES}
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index c90b11ae71..2a7e5f3ddb 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -34,7 +34,6 @@
#include "llimagetga.h"
#include "lldir.h"
#include "llvfile.h"
-#include "llvfs.h"
#include "lltexlayerparams.h"
#include "lltexturemanagerbridge.h"
#include "lllocaltextureobject.h"
--
cgit v1.2.3
From 2e6f5164116e084fe35f952180c3f7092ad8350f Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Wed, 16 Sep 2020 21:12:53 -0700
Subject: Renamed the references to LLVFile and llvfile.* source code plus
cmake scripts to use a different name - lldiskcache - since that more closely
resembles what it is (or will be) now that the VFA is no more
---
indra/llappearance/lltexlayer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/llappearance')
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 2a7e5f3ddb..7360c1acd7 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -33,7 +33,7 @@
#include "llimagej2c.h"
#include "llimagetga.h"
#include "lldir.h"
-#include "llvfile.h"
+#include "lldiskcache.h"
#include "lltexlayerparams.h"
#include "lltexturemanagerbridge.h"
#include "lllocaltextureobject.h"
--
cgit v1.2.3
From d9448c6f52218146113d1d5c5ca4c4d5f01dc5cf Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Thu, 17 Sep 2020 09:45:06 -0700
Subject: The folder where the disk cache lives was originally renamed from
llvfs to llcache but @henri's suggestion that that doesn't reflect the other
files in the same place and it should be llfilesystem is a good one so I
changed it over
---
indra/llappearance/CMakeLists.txt | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
(limited to 'indra/llappearance')
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)
--
cgit v1.2.3
From 6be1f88a5ef99e1e40bb5701a250ba0728f56005 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Thu, 24 Sep 2020 14:45:39 -0700
Subject: Complete the change from lldiskcache -> llfilesystem and then
addition of new lldiskcache implementation
---
indra/llappearance/lltexlayer.cpp | 1 -
1 file changed, 1 deletion(-)
(limited to 'indra/llappearance')
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 7360c1acd7..1348fb0763 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -33,7 +33,6 @@
#include "llimagej2c.h"
#include "llimagetga.h"
#include "lldir.h"
-#include "lldiskcache.h"
#include "lltexlayerparams.h"
#include "lltexturemanagerbridge.h"
#include "lllocaltextureobject.h"
--
cgit v1.2.3