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/newview/skins/default/xui/en/floater_scene_load_stats.xml | 6 ------
 indra/newview/skins/default/xui/en/floater_stats.xml            | 4 ----
 indra/newview/skins/default/xui/en/strings.xml                  | 2 --
 3 files changed, 12 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index 62cce3a1e3..35d4385487 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -206,12 +206,6 @@
                     bar_max="1024.f"
                     tick_spacing="128.f"
                     precision="1"
-                    show_bar="false"/>
-			    <stat_bar name="vfspendingoperations"
-                    label="VFS Pending Operations"
-                    orientation="horizontal"
-                    stat="vfspendingoperations"
-                    unit_label=" Ops."
                     show_bar="false"/>
 			  </stat_view>
 		  </stat_view>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index e4f735740b..f9d44b2c69 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -198,10 +198,6 @@
                     stat="messagedataout"
                     decimal_digits="1"
                     show_history="false"/>
-          <stat_bar name="vfspendingoperations"
-                    label="VFS Pending Operations"
-                    stat="vfspendingoperations"
-                    unit_label="Ops."/>
         </stat_view>
       </stat_view>
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1bfac6aeb7..9bd0f24d87 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -17,7 +17,6 @@
 	<string name="StartupLoading">Loading [APP_NAME]...</string>
 	<string name="StartupClearingCache">Clearing cache...</string>
 	<string name="StartupInitializingTextureCache">Initializing texture cache...</string>
-	<string name="StartupInitializingVFS">Initializing VFS...</string>
 	<string name="StartupRequireDriverUpdate">Graphics initialization failed. Please update your graphics driver!</string>
 
 	<!-- about dialog/support string-->
@@ -56,7 +55,6 @@ LOD factor: [LOD_FACTOR]
 Render quality: [RENDER_QUALITY]
 Advanced Lighting Model: [GPU_SHADERS]
 Texture memory: [TEXTURE_MEMORY]MB
-VFS (cache) creation time: [VFS_TIME]
 	</string>
 	<string name="AboutOSXHiDPI">
 HiDPI display mode: [HIDPI]
-- 
cgit v1.2.3