From e344b2afa21adf072837f1bcf4b38dd511b76f0e Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Thu, 26 Apr 2012 15:53:35 -0600
Subject: For SH-3121: collect time of reloading all textures from cache and
 through HTTP when all objects loading are done.

---
 .../xui/en/floater_texture_fetch_debugger.xml      | 64 +++++++++++++++++++---
 1 file changed, 56 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
index ff7528eeb7..7f95d0e84b 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -2,12 +2,12 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="480"
+ height="550"
  layout="topleft"
  name="TexFetchDebugger"
  help_topic="texfetchdebugger"
  title="Texture Fetching Debugger"
- width="500">
+ width="540">
   <text
    type="string"
    length="1"
@@ -77,8 +77,8 @@
    left_delta="0"
    name="total_fetched_data_label"
    top_delta="25"
-   width="480">
-    6, Total number of fetched data/Decoded Data: [SIZE1]KB / [SIZE2]KB
+   width="530">
+    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
   </text>
   <text
    type="string"
@@ -90,7 +90,7 @@
    name="total_fetched_vis_data_label"
    top_delta="25"
    width="480">
-    7, Total number of visible fetched data/Decoded Data: [SIZE1]KB / [SIZE2]KB
+    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
   </text>
   <text
    type="string"
@@ -101,8 +101,8 @@
    left_delta="0"
    name="total_fetched_rendered_data_label"
    top_delta="25"
-   width="480">
-    8, Total number of rendered fetched data/Decoded Data: [SIZE1]KB / [SIZE2]KB
+   width="530">
+    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
   </text>
   <text
    type="string"
@@ -176,13 +176,37 @@
    width="400">
     14, Total time on entire fetching: [TIME] seconds
   </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_cache_label"
+  top_delta="25"
+  width="540">
+    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_http_label"
+  top_delta="25"
+  width="540">
+    16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
   <spinner
      decimal_digits="1"
      follows="left|top"
      height="20"
      increment="0.1"
      initial_value="1.0"
-     label="15, Ratio of Texel/Pixel:"
+     label="17, Ratio of Texel/Pixel:"
      label_width="130"
      layout="topleft"
      left_delta="0"
@@ -289,4 +313,28 @@
     <button.commit_callback
 		function="TexFetchDebugger.GLTexture" />
   </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis Cache"
+   layout="topleft"
+   left="10"
+   name="refetchviscache_btn"
+   top_delta="30"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisCache" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="refetchvishttp_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisHTTP" />
+  </button>
 </floater>
-- 
cgit v1.2.3