merge changes for DRTVWR-149

3 files changed, 442 insertions, 35 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 2fd932786b..9400f7b94f 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -149,13 +149,52 @@
 				 show_per_sec="true"
 				 show_bar="false">
 			  </stat_bar>
+       <stat_bar
+				 name="object_cache_hits"
+				 label="Object Cache Hit Rate"
+				 stat="object_cache_hits"
+				 bar_min="0"
+				 bar_max="100"
+         unit_label="%"
+				 tick_spacing="20"
+				 label_spacing="20"
+				 show_history="true"
+         show_per_sec="false"
+				 show_bar="false">
+        </stat_bar>
 			</stat_view>
         <!--Texture Stats-->
 			<stat_view
 			   name="texture"
 			   label="Texture"
 			   show_label="true">
-			  <stat_bar
+        <stat_bar
+				 name="texture_cache_hits"
+				 label="Cache Hit Rate"
+				 stat="texture_cache_hits"
+				 bar_min="0.f"
+				 bar_max="100.f"
+         unit_label="%"
+				 tick_spacing="20"
+				 label_spacing="20"
+				 show_history="true"
+         show_per_sec="false"
+				 show_bar="false">
+        </stat_bar>
+        <stat_bar
+				 name="texture_cache_read_latency"
+				 label="Cache Read Latency"
+         unit_label="msec"
+				 stat="texture_cache_read_latency"
+				 bar_min="0.f"
+				 bar_max="1000.f"
+				 tick_spacing="100"
+				 label_spacing="200"
+				 show_history="true"
+         show_per_sec="false"
+				 show_bar="false">
+        </stat_bar>
+        <stat_bar
 				 name="numimagesstat"
 				 label="Count"
 				 stat="numimagesstat" 
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
new file mode 100644
index 0000000000..44b6a63bca
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+ legacy_header_height="18"

+ can_minimize="false"

+ height="550"

+ layout="topleft"

+ name="TexFetchDebugger"

+ help_topic="texfetchdebugger"

+ title="Texture Fetching Debugger"

+ width="540">

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left="10"

+   name="total_num_fetched_label"

+   top="30"

+   width="400">

+    1, Total number of fetched textures: [NUM]

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_num_fetching_requests_label"

+   top_delta="25"

+   width="400">

+    2, Total number of fetching requests: [NUM]

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_num_cache_hits_label"

+   top_delta="25"

+   width="400">

+    3, Total number of cache hits: [NUM]

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_num_visible_tex_label"

+   top_delta="25"

+   width="400">

+    4, Total number of visible textures: [NUM]

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_num_visible_tex_fetch_req_label"

+   top_delta="25"

+   width="450">

+    5, Total number of visible texture fetching requests: [NUM]

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_fetched_data_label"

+   top_delta="25"

+   width="530">

+    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_fetched_vis_data_label"

+   top_delta="25"

+   width="480">

+    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_fetched_rendered_data_label"

+   top_delta="25"

+   width="530">

+    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_time_cache_read_label"

+   top_delta="25"

+   width="400">

+    9, Total time on cache readings: [TIME] seconds

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_time_cache_write_label"

+   top_delta="25"

+   width="400">

+    10, Total time on cache writings: [TIME] seconds

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_time_decode_label"

+   top_delta="25"

+   width="400">

+    11, Total time on decodings: [TIME] seconds

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_time_gl_label"

+   top_delta="25"

+   width="400">

+    12, Total time on gl texture creation: [TIME] seconds

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_time_http_label"

+   top_delta="25"

+   width="400">

+    13, Total time on HTTP fetching: [TIME] seconds

+  </text>

+  <text

+   type="string"

+   length="1"

+   follows="left|top"

+   height="25"

+   layout="topleft"

+   left_delta="0"

+   name="total_time_fetch_label"

+   top_delta="25"

+   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="2"

+     follows="left|top"

+     height="20"

+     increment="0.01"

+     initial_value="1.0"

+     label="17, Ratio of Texel/Pixel:"

+     label_width="130"

+     layout="topleft"

+     left_delta="0"

+     max_val="10.0"

+     min_val="0.01"

+     name="texel_pixel_ratio"

+     top_delta="30"

+     width="200">

+    <spinner.commit_callback

+		function="TexFetchDebugger.ChangeTexelPixelRatio" />

+  </spinner>

+  <button

+   follows="left|top"

+   height="20"

+   label="Start"

+   layout="topleft"

+   left_delta="0"

+   name="start_btn"

+   top_delta="30"

+   width="70">

+    <button.commit_callback

+		function="TexFetchDebugger.Start" />

+  </button>

+  <button

+   follows="left|top"

+   height="20"

+   label="Reset"

+   layout="topleft"

+   left_pad="7"

+   name="clear_btn"

+   top_delta="0"

+   width="70">

+    <button.commit_callback

+		function="TexFetchDebugger.Clear" />

+  </button>

+  <button

+   follows="left|top"

+   height="20"

+   label="Close"

+   layout="topleft"

+   left_pad="7"

+   name="close_btn"

+   top_delta="0"

+   width="70">

+    <button.commit_callback

+		function="TexFetchDebugger.Close" />

+  </button>

+  <button

+   follows="left|top"

+   height="20"

+   label="Cache Read"

+   layout="topleft"

+   left="10"

+   name="cacheread_btn"

+   top_delta="30"

+   width="80">

+    <button.commit_callback

+		function="TexFetchDebugger.CacheRead" />

+  </button>

+  <button

+   follows="left|top"

+   height="20"

+   label="Cache Write"

+   layout="topleft"

+   left_pad="7"

+   name="cachewrite_btn"

+   top_delta="0"

+   width="80">

+    <button.commit_callback

+		function="TexFetchDebugger.CacheWrite" />

+  </button>

+  <button

+   follows="left|top"

+   height="20"

+   label="HTTP"

+   layout="topleft"

+   left_pad="7"

+   name="http_btn"

+   top_delta="0"

+   width="70">

+    <button.commit_callback

+		function="TexFetchDebugger.HTTPLoad" />

+  </button>

+  <button

+   follows="left|top"

+   height="20"

+   label="Decode"

+   layout="topleft"

+   left_pad="7"

+   name="decode_btn"

+   top_delta="0"

+   width="70">

+    <button.commit_callback

+		function="TexFetchDebugger.Decode" />

+  </button>

+  <button

+   follows="left|top"

+   height="20"

+   label="GL Texture"

+   layout="topleft"

+   left_pad="7"

+   name="gl_btn"

+   top_delta="0"

+   width="70">

+    <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>

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5ba566b175..a6898c554f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1876,7 +1876,7 @@
                 <menu_item_check.on_click
                  function="Advanced.ToggleConsole"
                  parameter="texture" />
-            </menu_item_check>
+            </menu_item_check>            
             <menu_item_check
              label="Debug Console"
              name="Debug Console"
@@ -1898,28 +1898,6 @@
                parameter="notifications_console" />
             </menu_item_call>
             <menu_item_check
-               label="Texture Size Console"
-               name="Texture Size"
-               shortcut="control|shift|6">
-              <menu_item_check.on_check
-               function="Advanced.CheckConsole"
-               parameter="texture size" />
-              <menu_item_check.on_click
-               function="Advanced.ToggleConsole"
-               parameter="texture size" />
-            </menu_item_check>
-            <menu_item_check
-               label="Texture Category Console"
-               name="Texture Category"
-               shortcut="control|shift|7">
-              <menu_item_check.on_check
-               function="Advanced.CheckConsole"
-               parameter="texture category" />
-              <menu_item_check.on_click
-               function="Advanced.ToggleConsole"
-               parameter="texture category" />
-            </menu_item_check>
-            <menu_item_check
              label="Fast Timers"
              name="Fast Timers"
              shortcut="control|shift|9"
@@ -1953,7 +1931,20 @@
                function="Advanced.ToggleConsole"
                parameter="scene view" />
             </menu_item_check>
-
+            <menu_item_call
+              enabled="false"
+              visible="false"
+              label="Texture Fetch Debug Console"
+              name="Texture Fetch Debug Console">
+              <menu_item_call.on_click
+                function="Floater.Show"
+                parameter="tex_fetch_debugger" />
+              <on_enable
+                function="Develop.SetTexFetchDebugger" />
+              <on_visible
+                function="Develop.SetTexFetchDebugger" />
+            </menu_item_call>
+          
             <menu_item_separator/>
 
             <menu_item_call
@@ -2439,6 +2430,52 @@
            function="Advanced.ToggleInfoDisplay"
            parameter="sculpt" />
 		</menu_item_check>
+       <menu
+         create_jump_keys="true"
+         label="Texture Density"
+         name="Texture Density"
+         tear_off="true">
+          <menu_item_check
+           label="None"
+           name="None">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="none" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="none" />
+          </menu_item_check>
+          <menu_item_check
+           label="Current"
+           name="Current">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="current" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="current" />
+          </menu_item_check>
+          <menu_item_check
+           label="Desired"
+           name="Desired">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="desired" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="desired" />
+          </menu_item_check>
+          <menu_item_check
+           label="Full"
+           name="Full">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="full" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="full" />
+          </menu_item_check>
+        </menu>
       </menu>
         <menu
          create_jump_keys="true"
@@ -2606,16 +2643,6 @@
                  parameter="TextureLoadFullRes" />
             </menu_item_check>
             <menu_item_check
-               label="Audit Textures"
-               name="Audit Textures">
-              <menu_item_check.on_check
-               function="CheckControl"
-               parameter="AuditTexture" />
-              <menu_item_check.on_click
-               function="ToggleControl"
-               parameter="AuditTexture" />
-            </menu_item_check>
-            <menu_item_check
              label="Texture Atlas (experimental)"
              name="Texture Atlas">
               <menu_item_check.on_check