Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.

13 files changed, 1359 insertions, 845 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 66bb9d3cea..9deb0d2030 100644
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -132,6 +132,28 @@
      name="vbo"
      tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
      width="315" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="10"
+    name="tc label"
+    top_pad="10"
+    width="188">
+    Enable S3TC:
+  </text>
+    <check_box
+     control_name="RenderCompressTextures"
+     height="16"
+     initial_value="true"
+     label="Enable Texture Compression (requires restart)"
+     layout="topleft"
+     left_pad="10"
+     name="texture compression"
+     tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
+     width="315" />
     <slider
      control_name="TextureMemory"
      decimal_digits="0"
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index e6d749a3f0..9561f67941 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -155,6 +155,7 @@
      name="object_name"
      top_delta="0"
      translate="false"
+     parse_urls="false"
      use_ellipses="true"
      width="185">
         Consetetur Sadipscing
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 464f7fcfe9..f9eb16d224 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -1,537 +1,576 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-    legacy_header_height="18"
-    can_resize="true"
-    height="400"
-    layout="topleft"
-    name="Statistics"
-    help_topic="statistics"
-    save_rect="true"
-    save_visibility="true"
-    title="STATISTICS"
-    width="260">
-  <scroll_container
-      follows="top|left|bottom|right"
-      height="380"
-      layout="topleft"
-      left="0"
-      name="statistics_scroll"
-      reserve_scroll_corner="true"
-      top="20"
-      width="260">
-    <container_view
-        follows="top|left|bottom|right"
-        height="378"
-        layout="topleft"
-        left="2"
-        name="statistics_view"
-        top="20"
-        width="245" >
-      <!--Basic Section-->
+ legacy_header_height="18"
+ can_resize="true"
+ height="400"
+ layout="topleft"
+ name="Statistics"
+ help_topic="statistics"
+ save_rect="true"
+ save_visibility="true"
+ title="STATISTICS"
+ width="260">
+    <scroll_container
+     follows="top|left|bottom|right"
+     height="380"
+     layout="topleft"
+     left="0"
+     name="statistics_scroll"
+     reserve_scroll_corner="true"
+     top="20"
+     width="260">
+      <container_view
+       follows="top|left|bottom|right"
+       height="378"
+       layout="topleft"
+       left="2"
+       name="statistics_view"
+       top="20"
+       width="245" >
+        <!--Basic Section-->
+		  <stat_view
+			 name="basic"
+			 label="Basic"
+			 show_label="true"
+			 setting="OpenDebugStatBasic">
+			<stat_bar
+			   name="fps"
+			   label="FPS"
+			   unit_label="fps"
+			   stat="fpsstat"
+			   bar_min="0"
+			   bar_max="60"
+			   tick_spacing="6"
+			   label_spacing="12"
+			   precision="1"
+			   show_bar="true"
+			   show_history="true">
+			</stat_bar>
+			<stat_bar
+			   name="bandwidth"
+			   label="Bandwidth"
+			   unit_label="kbps"
+			   stat="kbitstat"
+			   bar_min="0"
+			   bar_max="5000"
+			   tick_spacing="500"
+			   label_spacing="1000"
+				 precision="0"
+			   show_bar="true"
+			   show_history="false">
+			</stat_bar>
+			<stat_bar
+			   name="packet_loss"
+			   label="Packet Loss"
+			   unit_label=" %"
+			   stat="packetslostpercentstat"
+			   bar_min="0"
+			   bar_max="5"
+			   tick_spacing="0.5"
+			   label_spacing="1"
+			   precision="3"
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="true">
+			</stat_bar>
+			<stat_bar
+			   name="ping"
+			   label="Ping Sim"
+			   unit_label="msec"
+			   stat="simpingstat"
+			   bar_min="0"
+			   bar_max="5000"
+			   tick_spacing="500"
+			   label_spacing="1000"
+				 precision="0"
+			   show_bar="false"
+			   show_per_sec="false"
+			   show_mean="false">
+			</stat_bar>
+		  </stat_view>
+          <!--Advanced Section-->
       <stat_view
-          name="basic"
-          label="Basic"
-          show_label="true"
-          setting="OpenDebugStatBasic">
-        <stat_bar
-            name="fps"
-            label="FPS"
-            unit_label="fps"
-            stat="fpsstat"
-            bar_min="0"
-            bar_max="60"
-            tick_spacing="6"
-            label_spacing="12"
-            precision="1"
-            show_bar="true"
-            show_history="true">
+			 name="advanced"
+			 label="Advanced"
+			 show_label="true"
+			 setting="OpenDebugStatAdvanced">
+			<stat_view
+			   name="render"
+			   label="Render"
+			   show_label="true"
+			   setting="OpenDebugStatRender">
+			  <stat_bar
+				 name="ktrisframe"
+				 label="KTris Drawn per Frame"
+				 unit_label="/fr"
+				 stat="trianglesdrawnstat"
+				 bar_min="0"
+				 bar_max="10000"
+				 tick_spacing="1000"
+				 label_spacing="2000"
+				 precision="0"
+				 show_per_sec="false"
+         show_bar="false">
         </stat_bar>
-        <stat_bar
-            name="bandwidth"
-            label="Bandwidth"
-            unit_label="kbps"
-            stat="kbitstat"
-            bar_min="0"
-            bar_max="5000"
-            tick_spacing="500"
-            label_spacing="1000"
-            precision="0"
-            show_bar="true"
-            show_history="false">
+			  <stat_bar
+				 name="ktrissec"
+				 label="KTris Drawn per Sec"
+				 unit_label="/sec"
+				 stat="trianglesdrawnstat"
+				 bar_min="0"
+				 bar_max="200000"
+				 tick_spacing="25000"
+				 label_spacing="50000"
+				 precision="0"
+         show_bar="false">
         </stat_bar>
-        <stat_bar
-            name="packet_loss"
-            label="Packet Loss"
-            unit_label=" %"
-            stat="packetslostpercentstat"
-            bar_min="0"
-            bar_max="5"
-            tick_spacing="0.5"
-            label_spacing="1"
-            precision="3"
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="true">
+			  <stat_bar
+				 name="objs"
+				 label="Total Objects"
+				 unit_label=""
+				 stat="numobjectsstat"
+				 bar_min="0"
+				 bar_max="50000"
+				 tick_spacing="5000"
+				 label_spacing="10000"
+				 precision="0"
+				 show_per_sec="false"
+				 show_bar="false">
+			  </stat_bar>
+			  <stat_bar
+				 name="newobjs"
+				 label="New Objects"
+				 unit_label="/sec"
+				 stat="numnewobjectsstat"
+				 bar_min="0"
+				 bar_max="2000"
+				 tick_spacing="200"
+				 label_spacing="400"
+				 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_bar
-            name="ping"
-            label="Ping Sim"
-            unit_label="msec"
-            stat="simpingstat"
-            bar_min="0"
-            bar_max="5000"
-            tick_spacing="500"
-            label_spacing="1000"
-            precision="0"
-            show_bar="false"
-            show_per_sec="false"
-            show_mean="false">
-        </stat_bar>
-      </stat_view>
-      <!--Advanced Section-->
-      <stat_view
-          name="advanced"
-          label="Advanced"
-          show_label="true"
-          setting="OpenDebugStatAdvanced">
-        <stat_view
-            name="render"
-            label="Render"
-            show_label="true"
-            setting="OpenDebugStatRender">
-          <stat_bar
-              name="ktrisframe"
-              label="KTris Drawn per Frame"
-              unit_label="/fr"
-              stat="trianglesdrawnstat"
-              bar_min="0"
-              bar_max="10000"
-              tick_spacing="1000"
-              label_spacing="2000"
-              precision="0"
-              show_per_sec="false"
-              show_bar="false">
-          </stat_bar>
-          <stat_bar
-              name="ktrissec"
-              label="KTris Drawn per Sec"
-              unit_label="/sec"
-              stat="trianglesdrawnstat"
-              bar_min="0"
-              bar_max="200000"
-              tick_spacing="25000"
-              label_spacing="50000"
-              precision="0"
-              show_bar="false">
-          </stat_bar>
-          <stat_bar
-              name="objs"
-              label="Total Objects"
-              unit_label=""
-              stat="numobjectsstat"
-              bar_min="0"
-              bar_max="50000"
-              tick_spacing="5000"
-              label_spacing="10000"
-              precision="0"
-              show_per_sec="false"
-              show_bar="false">
-          </stat_bar>
-          <stat_bar
-              name="newobjs"
-              label="New Objects"
-              unit_label="/sec"
-              stat="numnewobjectsstat"
-              bar_min="0"
-              bar_max="2000"
-              tick_spacing="200"
-              label_spacing="400"
-              show_per_sec="true"
-              show_bar="false">
-          </stat_bar>
-        </stat_view>
+			</stat_view>
         <!--Texture Stats-->
-        <stat_view
-            name="texture"
-            label="Texture"
-            show_label="true">
-          <stat_bar
-              name="numimagesstat"
-              label="Count"
-              stat="numimagesstat" 
-              bar_min="0.f"
-              bar_max="8000.f" 
-              tick_spacing="2000.f"
-              label_spacing="4000.f" 
-              show_per_sec="false"
-              show_bar="false">
-          </stat_bar>
-
-          <stat_bar
-              name="numrawimagesstat"
-              label="Raw Count"
-              stat="numrawimagesstat"
-              bar_min="0.f"
-              bar_max="8000.f" 
-              tick_spacing="2000.f"
-              label_spacing="4000.f" 
-              show_per_sec="false"
-              show_bar="false">
-          </stat_bar>
-
-          <stat_bar
-              name="gltexmemstat"
-              label="GL Mem"
-              stat="gltexmemstat"
-              bar_min="0.f"
-              bar_max="400.f" 
-              tick_spacing="100.f"
-              label_spacing="200.f" 
-              precision="1"
-              show_per_sec="false" 
-              show_bar="false">
-          </stat_bar>
-
-          <stat_bar
-              name="formattedmemstat"
-              label="Formatted Mem"
-              stat="formattedmemstat"
-              bar_min="0.f"
-              bar_max="400.f" 
-              tick_spacing="100.f"
-              label_spacing="200.f" 
-              precision="1"
-              show_per_sec="false" 
-              show_bar="false">
-          </stat_bar>
-
-          <stat_bar
-              name="rawmemstat"
-              label="Raw Mem"
-              stat="rawmemstat"
-              bar_min="0.f"
-              bar_max="400.f" 
-              tick_spacing="100.f"
-              label_spacing="200.f" 
-              precision="1"
-              show_per_sec="false" 
-              show_bar="false">
-          </stat_bar>
-
-          <stat_bar
-              name="glboundmemstat"
-              label="Bound Mem"
-              stat="glboundmemstat"
-              bar_min="0.f"
-              bar_max="400.f" 
-              tick_spacing="100.f"
-              label_spacing="200.f" 
-              precision="1"
-              show_per_sec="false" 
-              show_bar="false">
-          </stat_bar>
-        </stat_view>
-        <!--Network Stats-->
-        <stat_view
-            name="network"
-            label="Network"
-            show_label="true"
-            setting="OpenDebugStatNet">
-          <stat_bar
-              name="packetsinstat"
-              label="Packets In"
-              stat="packetsinstat"
-              unit_label="/sec" 
-              bar_min="0.f"
-              bar_max="1024.f" 
-              tick_spacing="128.f"
-              label_spacing="256.f" 
-              precision="1"
-              show_bar="false">
-          </stat_bar>
-
-          <stat_bar
-              name="packetsoutstat"
-              label="Packets Out"
-              stat="packetsoutstat"
-              unit_label="/sec"  
-              bar_min="0.f"
-              bar_max="1024.f" 
-              tick_spacing="128.f"
-              label_spacing="256.f" 
-              precision="1"
-              show_bar="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="objectkbitstat"
-              label="Objects"
-              stat="objectkbitstat"
-              unit_label="kbps"
-              bar_min="0.f"
-              bar_max="1024.f"
-              tick_spacing="128.f"
-              label_spacing="256.f"
-              precision="1"
-              show_bar="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="texturekbitstat"
-              label="Texture"
-              stat="texturekbitstat"
-              unit_label="kbps"
-              bar_min="0.f"
-              bar_max="1024.f"
-              tick_spacing="128.f"
-              label_spacing="256.f"
-              precision="1"
-              show_bar="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="assetkbitstat"
-              label="Asset"
-              stat="assetkbitstat"
-              unit_label="kbps"
-              bar_min="0.f"
-              bar_max="1024.f"
-              tick_spacing="128.f"
-              label_spacing="256.f"
-              precision="1"
-              show_bar="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="layerskbitstat"
-              label="Layers"
-              stat="layerskbitstat"
-              unit_label="kbps"
-              bar_min="0.f"
-              bar_max="1024.f"
-              tick_spacing="128.f"
-              label_spacing="256.f"
-              precision="1"
-              show_bar="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="actualinkbitstat"
-              label="Actual In"
-              stat="actualinkbitstat"
-              unit_label="kbps"
-              bar_min="0.f"
-              bar_max="1024.f"
-              tick_spacing="128.f"
-              label_spacing="256.f"
-              precision="1"
-              show_bar="false"
-              show_history="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="actualoutkbitstat"
-              label="Actual Out"
-              stat="actualoutkbitstat"
-              unit_label="kbps"
-              bar_min="0.f"
-              bar_max="1024.f"
-              tick_spacing="128.f"
-              label_spacing="256.f"
-              precision="1"
-              show_bar="false"
-              show_history="false">
-          </stat_bar>
-
-          <stat_bar
-              name="vfspendingoperations"
-              label="VFS Pending Operations"
-              stat="vfspendingoperations"
-              unit_label=" Ops."
-              show_per_sec="false"
-              show_bar="false" >
-          </stat_bar>
-        </stat_view>
-      </stat_view>
-      <!--Sim Stats-->
-      <stat_view
-          name="sim"
-          label="Simulator"
-          show_label="true"
-          setting="OpenDebugStatSim">
-        <stat_bar
-            name="simtimedilation"
-            label="Time Dilation"
-            stat="simtimedilation"
-            precision="3"
-            bar_min="0.f"
-            bar_max="1.f" 
-            tick_spacing="0.16666f"
-            label_spacing="0.33333f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
+			<stat_view
+			   name="texture"
+			   label="Texture"
+			   show_label="true">
+			  <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="simfps"
-            label="Sim FPS"
-            stat="simfps"
-            precision="1"
-            bar_min="0.f"
-            bar_max="45.f" 
-            tick_spacing="7.5f"
-            label_spacing="15.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
+				 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="simphysicsfps"
-            label="Physics FPS"
-            stat="simphysicsfps"
-            precision="1"
-            bar_min="0.f"
-            bar_max="45.f" 
-            tick_spacing="7.5.f"
-            label_spacing="15.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
+				 name="numimagesstat"
+				 label="Count"
+				 stat="numimagesstat" 
+				 bar_min="0.f"
+				 bar_max="8000.f" 
+				 tick_spacing="2000.f"
+				 label_spacing="4000.f" 
+				 show_per_sec="false"
+				 show_bar="false">
+			  </stat_bar>
+
+			  <stat_bar
+				 name="numrawimagesstat"
+				 label="Raw Count"
+				 stat="numrawimagesstat"
+				 bar_min="0.f"
+				 bar_max="8000.f" 
+				 tick_spacing="2000.f"
+				 label_spacing="4000.f" 
+				 show_per_sec="false"
+				 show_bar="false">
+			  </stat_bar>
+
+			  <stat_bar
+				 name="gltexmemstat"
+				 label="GL Mem"
+				 stat="gltexmemstat"
+				 bar_min="0.f"
+				 bar_max="400.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 precision="1"
+				 show_per_sec="false" 
+         show_bar="false">
         </stat_bar>
 
-        <stat_view
-            name="physicsdetail"
-            label="Physics Details"
-            show_label="true">
-          <stat_bar
-              name="physicspinnedtasks"
-              label="Pinned Objects"
-              stat="physicspinnedtasks"
-              precision="0" 
-              bar_min="0.f"
-              bar_max="500.f" 
-              tick_spacing="50.f"
-              label_spacing="100.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="physicslodtasks"
-              label="Low LOD Objects"
-              stat="physicslodtasks"
-              precision="0"
-              bar_min="0.f"
-              bar_max="500.f" 
-              tick_spacing="50.f"
-              label_spacing="100.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="physicsmemoryallocated"
-              label="Memory Allocated"
-              stat="physicsmemoryallocated"
-              unit_label="MB"
-              precision="1"
-              bar_min="0.f"
-              bar_max="1024.f" 
-              tick_spacing="128.f"
-              label_spacing="256.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-        </stat_view>
-
-        <stat_bar
-            name="simagentups"
-            label="Agent Updates/Sec"
-            stat="simagentups"
-            precision="1"
-            bar_min="0.f"
-            bar_max="100.f" 
-            tick_spacing="25.f"
-            label_spacing="50.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
-        </stat_bar>
-
-        <stat_bar
-            name="simmainagents"
-            label="Main Agents"
-            stat="simmainagents"
-            precision="0"
-            bar_min="0.f"
-            bar_max="80.f" 
-            tick_spacing="10.f"
-            label_spacing="40.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
+			  <stat_bar
+				 name="formattedmemstat"
+				 label="Formatted Mem"
+				 stat="formattedmemstat"
+				 bar_min="0.f"
+				 bar_max="400.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 precision="1"
+				 show_per_sec="false" 
+         show_bar="false">
         </stat_bar>
 
-        <stat_bar
-            name="simchildagents"
-            label="Child Agents"
-            stat="simchildagents"
-            precision="0"
-            bar_min="0.f"
-            bar_max="40.f" 
-            tick_spacing="5.f"
-            label_spacing="10.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
+			  <stat_bar
+				 name="rawmemstat"
+				 label="Raw Mem"
+				 stat="rawmemstat"
+				 bar_min="0.f"
+				 bar_max="400.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 precision="1"
+				 show_per_sec="false" 
+         show_bar="false">
         </stat_bar>
 
-        <stat_bar
-            name="simobjects"
-            label="Objects"
-            stat="simobjects"
-            precision="0"
-            bar_min="0.f"
-            bar_max="30000.f" 
-            tick_spacing="5000.f"
-            label_spacing="10000.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
-        </stat_bar>
-
-        <stat_bar
-            name="simactiveobjects"
-            label="Active Objects"
-            stat="simactiveobjects"
-            precision="0"
-            bar_min="0.f"
-            bar_max="5000.f" 
-            tick_spacing="750.f"
-            label_spacing="1250.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
-        </stat_bar>
-
-        <stat_bar
-            name="simactivescripts"
-            label="Active Scripts"
-            stat="simactivescripts"
-            precision="0"
-            bar_min="0.f"
-            bar_max="15000.f" 
-            tick_spacing="1875.f"
-            label_spacing="3750.f"  
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
+			  <stat_bar
+				 name="glboundmemstat"
+				 label="Bound Mem"
+				 stat="glboundmemstat"
+				 bar_min="0.f"
+				 bar_max="400.f" 
+				 tick_spacing="100.f"
+				 label_spacing="200.f" 
+				 precision="1"
+				 show_per_sec="false" 
+         show_bar="false">
         </stat_bar>
+			</stat_view>
+        <!--Network Stats-->
+			<stat_view
+			   name="network"
+			   label="Network"
+			   show_label="true"
+			   setting="OpenDebugStatNet">
+			  <stat_bar
+				 name="packetsinstat"
+				 label="Packets In"
+				 stat="packetsinstat"
+				 unit_label="/sec" 
+         bar_min="0.f"
+				 bar_max="1024.f" 
+				 tick_spacing="128.f"
+				 label_spacing="256.f" 
+				 precision="1"
+				 show_bar="false">
+			  </stat_bar>
+
+			  <stat_bar
+				 name="packetsoutstat"
+				 label="Packets Out"
+				 stat="packetsoutstat"
+				 unit_label="/sec"  
+         bar_min="0.f"
+				 bar_max="1024.f" 
+				 tick_spacing="128.f"
+				 label_spacing="256.f" 
+				 precision="1"
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="objectkbitstat"
+				 label="Objects"
+				 stat="objectkbitstat"
+         unit_label="kbps"
+         bar_min="0.f"
+         bar_max="1024.f"
+         tick_spacing="128.f"
+         label_spacing="256.f"
+         precision="1"
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="texturekbitstat"
+				 label="Texture"
+				 stat="texturekbitstat"
+         unit_label="kbps"
+         bar_min="0.f"
+         bar_max="1024.f"
+         tick_spacing="128.f"
+         label_spacing="256.f"
+         precision="1"
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="assetkbitstat"
+				 label="Asset"
+				 stat="assetkbitstat"
+         unit_label="kbps"
+         bar_min="0.f"
+         bar_max="1024.f"
+         tick_spacing="128.f"
+         label_spacing="256.f"
+         precision="1"
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="layerskbitstat"
+				 label="Layers"
+				 stat="layerskbitstat"
+         unit_label="kbps"
+         bar_min="0.f"
+         bar_max="1024.f"
+         tick_spacing="128.f"
+         label_spacing="256.f"
+         precision="1"
+				 show_bar="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="actualinkbitstat"
+				 label="Actual In"
+				 stat="actualinkbitstat"
+         unit_label="kbps"
+         bar_min="0.f"
+         bar_max="1024.f"
+         tick_spacing="128.f"
+         label_spacing="256.f"
+         precision="1"
+				 show_bar="false"
+				 show_history="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="actualoutkbitstat"
+				 label="Actual Out"
+				 stat="actualoutkbitstat"
+         unit_label="kbps"
+         bar_min="0.f"
+         bar_max="1024.f"
+         tick_spacing="128.f"
+         label_spacing="256.f"
+         precision="1"
+				 show_bar="false"
+				 show_history="false">
+			  </stat_bar>
+
+			  <stat_bar
+				 name="vfspendingoperations"
+				 label="VFS Pending Operations"
+				 stat="vfspendingoperations"
+				 unit_label=" Ops."
+				 show_per_sec="false"
+				 show_bar="false" >
+			  </stat_bar>
+			</stat_view>
+		  </stat_view>
+        <!--Sim Stats-->
+		  <stat_view
+			 name="sim"
+			 label="Simulator"
+			 show_label="true"
+			 setting="OpenDebugStatSim">
+			<stat_bar
+			   name="simtimedilation"
+			   label="Time Dilation"
+			   stat="simtimedilation"
+			   precision="3"
+			   bar_min="0.f"
+			   bar_max="1.f" 
+			   tick_spacing="0.16666f"
+			   label_spacing="0.33333f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simfps"
+			   label="Sim FPS"
+			   stat="simfps"
+			   precision="1"
+			   bar_min="0.f"
+			   bar_max="45.f" 
+			   tick_spacing="7.5f"
+			   label_spacing="15.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simphysicsfps"
+			   label="Physics FPS"
+			   stat="simphysicsfps"
+			   precision="1"
+			   bar_min="0.f"
+			   bar_max="45.f" 
+			   tick_spacing="7.5.f"
+			   label_spacing="15.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_view
+			   name="physicsdetail"
+			   label="Physics Details"
+			   show_label="true">
+			  <stat_bar
+				 name="physicspinnedtasks"
+				 label="Pinned Objects"
+				 stat="physicspinnedtasks"
+				 precision="0" 
+				 bar_min="0.f"
+				 bar_max="500.f" 
+				 tick_spacing="50.f"
+				 label_spacing="100.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="physicslodtasks"
+				 label="Low LOD Objects"
+				 stat="physicslodtasks"
+				 precision="0"
+				 bar_min="0.f"
+				 bar_max="500.f" 
+				 tick_spacing="50.f"
+				 label_spacing="100.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="physicsmemoryallocated"
+				 label="Memory Allocated"
+				 stat="physicsmemoryallocated"
+				 unit_label="MB"
+				 precision="1"
+				 bar_min="0.f"
+				 bar_max="1024.f" 
+				 tick_spacing="128.f"
+				 label_spacing="256.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+		  </stat_view>
+
+			<stat_bar
+			   name="simagentups"
+			   label="Agent Updates/Sec"
+			   stat="simagentups"
+			   precision="1"
+			   bar_min="0.f"
+			   bar_max="100.f" 
+			   tick_spacing="25.f"
+			   label_spacing="50.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simmainagents"
+			   label="Main Agents"
+			   stat="simmainagents"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="80.f" 
+			   tick_spacing="10.f"
+			   label_spacing="40.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simchildagents"
+			   label="Child Agents"
+			   stat="simchildagents"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="40.f" 
+			   tick_spacing="5.f"
+			   label_spacing="10.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simobjects"
+			   label="Objects"
+			   stat="simobjects"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="30000.f" 
+			   tick_spacing="5000.f"
+			   label_spacing="10000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simactiveobjects"
+			   label="Active Objects"
+			   stat="simactiveobjects"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="5000.f" 
+			   tick_spacing="750.f"
+			   label_spacing="1250.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simactivescripts"
+			   label="Active Scripts"
+			   stat="simactivescripts"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="15000.f" 
+			   tick_spacing="1875.f"
+			   label_spacing="3750.f"  
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
         <stat_bar
             name="simpctscriptsrun"
             label="Scripts Run"
@@ -547,20 +586,20 @@
             show_mean="true">
         </stat_bar>
 
-        <stat_bar
-            name="simscripteps"
-            label="Script Events"
-            stat="simscripteps"
-            unit_label="eps"
-            precision="0"
-            bar_min="0.f"
-            bar_max="5000.f" 
-            tick_spacing="750.f"
-            label_spacing="1250.f"  
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
-        </stat_bar>
+			<stat_bar
+			   name="simscripteps"
+			   label="Script Events"
+			   stat="simscripteps"
+			   unit_label="eps"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="5000.f" 
+			   tick_spacing="750.f"
+			   label_spacing="1250.f"  
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
         <stat_view
             name="simpathfinding"
@@ -609,280 +648,280 @@
           </stat_bar>
         </stat_view>
 
-        <stat_bar
-            name="siminpps"
-            label="Packets In"
-            stat="siminpps"
-            unit_label="pps"
-            precision="0"
-            bar_min="0.f"
-            bar_max="2000.f" 
-            tick_spacing="250.f"
-            label_spacing="1000.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
-        </stat_bar>
+			<stat_bar
+			   name="siminpps"
+			   label="Packets In"
+			   stat="siminpps"
+			   unit_label="pps"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="2000.f" 
+			   tick_spacing="250.f"
+			   label_spacing="1000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simoutpps"
+			   label="Packets Out"
+			   stat="simoutpps"
+			   unit_label="pps" 
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="2000.f" 
+			   tick_spacing="250.f"
+			   label_spacing="1000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simpendingdownloads"
+			   label="Pending Downloads"
+			   stat="simpendingdownloads"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="800.f" 
+			   tick_spacing="100.f"
+			   label_spacing="200.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simpendinguploads"
+			   label="Pending Uploads"
+			   stat="simpendinguploads"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="100.f" 
+			   tick_spacing="25.f"
+			   label_spacing="50.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simtotalunackedbytes"
+			   label="Total Unacked Bytes"
+			   stat="simtotalunackedbytes"
+			   unit_label="kb"
+			   precision="1"
+			   bar_min="0.f"
+			   bar_max="100000.f" 
+			   tick_spacing="25000.f"
+			   label_spacing="50000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_view
+			   name="simperf"
+			   label="Time (ms)"
+			   show_label="true">
+			  <stat_bar
+				 name="simframemsec"
+				 label="Total Frame Time"
+				 stat="simframemsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simnetmsec"
+				 label="Net Time"
+				 stat="simnetmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simsimphysicsmsec"
+				 label="Physics Time"
+				 stat="simsimphysicsmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simsimothermsec"
+				 label="Simulation Time"
+				 stat="simsimothermsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simagentmsec"
+				 label="Agent Time"
+				 stat="simagentmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simimagesmsec"
+				 label="Images Time"
+				 stat="simimagesmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simscriptmsec"
+				 label="Script Time"
+				 stat="simscriptmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_min="0.f"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_per_sec="false"
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
 
         <stat_bar
-            name="simoutpps"
-            label="Packets Out"
-            stat="simoutpps"
-            unit_label="pps" 
-            precision="0"
-            bar_min="0.f"
-            bar_max="2000.f" 
-            tick_spacing="250.f"
-            label_spacing="1000.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
+         name="simsparemsec"
+         label="Spare Time"
+         stat="simsparemsec"
+         unit_label="ms"
+         precision="3"
+         bar_min="0.f"
+         bar_max="40.f"
+         tick_spacing="10.f"
+         label_spacing="20.f"
+         show_per_sec="false"
+         show_bar="false"
+         show_mean="false" >
         </stat_bar>
-
-        <stat_bar
-            name="simpendingdownloads"
-            label="Pending Downloads"
-            stat="simpendingdownloads"
-            precision="0"
-            bar_min="0.f"
-            bar_max="800.f" 
-            tick_spacing="100.f"
-            label_spacing="200.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
-        </stat_bar>
-
-        <stat_bar
-            name="simpendinguploads"
-            label="Pending Uploads"
-            stat="simpendinguploads"
-            precision="0"
-            bar_min="0.f"
-            bar_max="100.f" 
-            tick_spacing="25.f"
-            label_spacing="50.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
-        </stat_bar>
-
-        <stat_bar
-            name="simtotalunackedbytes"
-            label="Total Unacked Bytes"
-            stat="simtotalunackedbytes"
-            unit_label="kb"
-            precision="1"
-            bar_min="0.f"
-            bar_max="100000.f" 
-            tick_spacing="25000.f"
-            label_spacing="50000.f" 
-            show_per_sec="false"
-            show_bar="false"
-            show_mean="false" >
-        </stat_bar>
-
-        <stat_view
-            name="simperf"
-            label="Time (ms)"
-            show_label="true">
-          <stat_bar
-              name="simframemsec"
-              label="Total Frame Time"
-              stat="simframemsec"
-              unit_label="ms"
-              precision="3"
-              bar_min="0.f"
-              bar_max="40.f" 
-              tick_spacing="10.f"
-              label_spacing="20.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="simnetmsec"
-              label="Net Time"
-              stat="simnetmsec"
-              unit_label="ms"
-              precision="3"
-              bar_min="0.f"
-              bar_max="40.f" 
-              tick_spacing="10.f"
-              label_spacing="20.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="simsimphysicsmsec"
-              label="Physics Time"
-              stat="simsimphysicsmsec"
-              unit_label="ms"
-              precision="3"
-              bar_min="0.f"
-              bar_max="40.f" 
-              tick_spacing="10.f"
-              label_spacing="20.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="simsimothermsec"
-              label="Simulation Time"
-              stat="simsimothermsec"
-              unit_label="ms"
-              precision="3"
-              bar_min="0.f"
-              bar_max="40.f" 
-              tick_spacing="10.f"
-              label_spacing="20.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="simagentmsec"
-              label="Agent Time"
-              stat="simagentmsec"
-              unit_label="ms"
-              precision="3"
-              bar_min="0.f"
-              bar_max="40.f" 
-              tick_spacing="10.f"
-              label_spacing="20.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="simimagesmsec"
-              label="Images Time"
-              stat="simimagesmsec"
-              unit_label="ms"
-              precision="3"
-              bar_min="0.f"
-              bar_max="40.f" 
-              tick_spacing="10.f"
-              label_spacing="20.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="simscriptmsec"
-              label="Script Time"
-              stat="simscriptmsec"
-              unit_label="ms"
-              precision="3"
-              bar_min="0.f"
-              bar_max="40.f" 
-              tick_spacing="10.f"
-              label_spacing="20.f" 
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-
-          <stat_bar
-              name="simsparemsec"
-              label="Spare Time"
-              stat="simsparemsec"
-              unit_label="ms"
-              precision="3"
-              bar_min="0.f"
-              bar_max="40.f"
-              tick_spacing="10.f"
-              label_spacing="20.f"
-              show_per_sec="false"
-              show_bar="false"
-              show_mean="false" >
-          </stat_bar>
-          <!--2nd level time blocks under 'Details' second-->
+        <!--2nd level time blocks under 'Details' second-->
           <stat_view
-              name="timedetails"
-              label="Time Details (ms)"
-              show_label="true">
+ 			     name="timedetails"
+			     label="Time Details (ms)"
+			     show_label="true">
             <stat_bar
-                name="simsimphysicsstepmsec"
-                label="  Physics Step"
-                stat="simsimphysicsstepmsec"
-                unit_label="ms"
-                precision="3"
-                bar_min="0.f"
-                bar_max="40.f"
-                tick_spacing="10.f"
-                label_spacing="20.f"
-                show_per_sec="false"
-                show_bar="false"
-                show_mean="false" >
+             name="simsimphysicsstepmsec"
+             label="  Physics Step"
+             stat="simsimphysicsstepmsec"
+             unit_label="ms"
+             precision="3"
+             bar_min="0.f"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_per_sec="false"
+             show_bar="false"
+             show_mean="false" >
             </stat_bar>
             <stat_bar
-                name="simsimphysicsshapeupdatemsec"
-                label="  Update Phys Shapes"
-                stat="simsimphysicsshapeupdatemsec"
-                unit_label="ms"
-                precision="3"
-                bar_min="0.f"
-                bar_max="40.f"
-                tick_spacing="10.f"
-                label_spacing="20.f"
-                show_per_sec="false"
-                show_bar="false"
-                show_mean="false" >
+             name="simsimphysicsshapeupdatemsec"
+             label="  Update Phys Shapes"
+             stat="simsimphysicsshapeupdatemsec"
+             unit_label="ms"
+             precision="3"
+             bar_min="0.f"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_per_sec="false"
+             show_bar="false"
+             show_mean="false" >
             </stat_bar>
             <stat_bar
-                name="simsimphysicsothermsec"
-                label="  Physics Other"
-                stat="simsimphysicsothermsec"
-                unit_label="ms"
-                precision="3"
-                bar_min="0.f"
-                bar_max="40.f"
-                tick_spacing="10.f"
-                label_spacing="20.f"
-                show_per_sec="false"
-                show_bar="false"
-                show_mean="false" >
+             name="simsimphysicsothermsec"
+             label="  Physics Other"
+             stat="simsimphysicsothermsec"
+             unit_label="ms"
+             precision="3"
+             bar_min="0.f"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_per_sec="false"
+             show_bar="false"
+             show_mean="false" >
             </stat_bar>
             <stat_bar
-                name="simsleepmsec"
-                label="  Sleep Time"
-                stat="simsleepmsec"
-                unit_label="ms"
-                precision="3"
-                bar_min="0.f"
-                bar_max="40.f"
-                tick_spacing="10.f"
-                label_spacing="20.f"
-                show_per_sec="false"
-                show_bar="false"
-                show_mean="false" >
+             name="simsleepmsec"
+             label="  Sleep Time"
+             stat="simsleepmsec"
+             unit_label="ms"
+             precision="3"
+             bar_min="0.f"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_per_sec="false"
+             show_bar="false"
+             show_mean="false" >
             </stat_bar>
             <stat_bar
-                name="simpumpiomsec"
-                label="  Pump IO"
-                stat="simpumpiomsec"
-                unit_label="ms"
-                precision="3"
-                bar_min="0.f"
-                bar_max="40.f"
-                tick_spacing="10.f"
-                label_spacing="20.f"
-                show_per_sec="false"
-                show_bar="false"
-                show_mean="false" >
+             name="simpumpiomsec"
+             label="  Pump IO"
+             stat="simpumpiomsec"
+             unit_label="ms"
+             precision="3"
+             bar_min="0.f"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_per_sec="false"
+             show_bar="false"
+             show_mean="false" >
             </stat_bar>
-          </stat_view>
-        </stat_view>
-      </stat_view>
-    </container_view>
-  </scroll_container>
+			</stat_view>
+			</stat_view>
+		  </stat_view>
+		</container_view>
+    </scroll_container>
 </floater>
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 7e6709f0d6..1682996c74 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1911,7 +1911,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"
@@ -1933,28 +1933,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"
@@ -1988,7 +1966,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
@@ -2474,6 +2465,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"
@@ -2641,16 +2678,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
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b9f041ae3e..922ddcedd8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1267,6 +1267,25 @@ Visit [_URL] for more information?
 
   <notification
    icon="alertmodal.tga"
+   name="IntelOldDriver"
+   type="alertmodal">
+     There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
+
+    Visit [_URL] to check for driver updates?
+    <tag>confirm</tag>
+    <url option="0" name="url">
+      http://www.intel.com/p/en_US/support/detect/graphics
+    </url>
+    <usetemplate
+     ignoretext="My graphics driver is out of date"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="UnknownGPU"
    type="alertmodal">
 Your system contains a graphics card that [APP_NAME] doesn't recognize.
@@ -6443,31 +6462,28 @@ Is this OK?
   <notification
    icon="notify.tga"
    name="ScriptQuestionCaution"
-   priority="high"
+   priority="critical"
    persist="true"
    type="notify">
-An object named &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, owned by &apos;[NAME]&apos; would like to:
-
-[QUESTIONS]
-If you do not trust this object and its creator, you should deny the request.
+Warning: The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.
+  
+It is rare that such a request is legitimate. Do not allow access if you do not fully understand why it wants access to your account.
 
-Grant this request?
   <tag>confirm</tag>
     <form name="form">
       <button
        index="0"
        name="Grant"
-       text="Grant"/>
+       text="Allow total access"/>
       <button
        default="true"
        index="1"
        name="Deny"
        text="Deny"/>
-      <button
-       index="2"
-       name="Details"
-       text="Details..."/>
     </form>
+    <footer>
+[FOOTERTEXT]
+    </footer>
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
new file mode 100644
index 0000000000..b0436bb6dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<panel
+  background_opaque="false"
+  border_visible="false"
+  background_visible="true"
+  bg_alpha_color="PanelNotificationBackground"
+  bg_opaque_color="PanelNotificationBackground"
+  chrome="true"
+  height="270"
+  label="script_question_panel"
+  layout="topleft"
+  left="0"
+  name="panel_script_question_toast"
+  top="0"
+  width="305">
+    <text
+      follows="left|right|top"
+      font="SansSerifBold"
+      height="160"
+      layout="topleft"
+      left="10"
+      mouse_opaque="false"
+      name="top_info_message"
+      parse_highlights="true"
+      parse_urls="true"
+      text_color="NotifyCautionBoxColor"
+      top="10"
+      value=""
+      width="285"
+      wrap="true"/>
+    <panel
+      background_visible="false"
+      follows="left|right|top"
+      height="30"
+      label="buttons_panel"
+      layout="topleft"
+      name="buttons_panel"
+      top_pad="10"
+      width="285">
+    </panel>
+    <text
+      follows="all"
+      font="SansSerifBold"
+      height="55"
+      layout="topleft"
+      mouse_opaque="false"
+      name="bottom_info_message"
+      parse_highlights="true"
+      parse_urls="true"
+      text_color="NotifyCautionBoxColor"
+      top_pad="5"
+      value=""
+      width="285"
+      wrap="true"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index dbf44d8767..d246918cd3 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -275,19 +275,19 @@
                 <combo_box.item
                  label="Touch  (default)"
                  name="Touch/grab(default)"
-                 value="Touch/grab (default)" />
+                 value="Touch" />
                 <combo_box.item
                  label="Sit on object"
                  name="Sitonobject"
-                 value="Sit on object" />
+                 value="Sit" />
                 <combo_box.item
                  label="Buy object"
                  name="Buyobject"
-                 value="Buy object" />
+                 value="Buy" />
                 <combo_box.item
                  label="Pay object"
                  name="Payobject"
-                 value="Pay object" />
+                 value="Pay" />
                 <combo_box.item
                  label="Open"
                  name="Open"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a177054211..1f168b0ccd 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -393,6 +393,7 @@ Please try logging in again in a minute.</string>
   <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
 	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
 	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
+	<string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string>
 	<string name="ScriptTakeMoney">Take Linden dollars (L$) from you</string>
 	<string name="ActOnControlInputs">Act on your control inputs</string>
 	<string name="RemapControlInputs">Remap your control inputs</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 6f8885487a..49af1a87e1 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -439,7 +439,7 @@ musique :
 			<text name="Sound:">
 				Son :
 			</text>
-			<check_box label="Limiter les gestes et sons d&apos;objet à cette parcelle" name="check sound local"/>
+			<check_box label="Limiter les sons des gestes et des objets à cette parcelle" name="check sound local"/>
 			<text name="Avatar Sounds:">
 				Sons d&apos;avatar :
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 3eebed450f..8b410128da 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -4509,7 +4509,7 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 		Backsp
 	</string>
 	<string name="Shift">
-		Shift
+		Maj
 	</string>
 	<string name="Ctrl">
 		Ctrl
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 54031ccf12..7bf8a7b8be 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2895,6 +2895,18 @@ M キーを押して変更します。
 [RESIDENTS]
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
 	</notification>
+	<notification name="ShareFolderConfirmation">
+		フォルダは一度に 1 つしか共有できません。
+
+次のアイテムを共有しますか？
+
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+
+次の住人と共有：
+
+[RESIDENTS]
+		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
+	</notification>
 	<notification name="ItemsShared">
 		アイテムが共有されました。
 	</notification>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index d7d5d59a33..fd973bf3c2 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -118,7 +118,7 @@
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
 		<menu label="Scripts" name="Scripts">
-			<menu_item_call label="Recompilar scripts (LSL)" name="Mono"/>
+			<menu_item_call label="Recompilar scripts (Mono)" name="Mono"/>
 			<menu_item_call label="Recompilar scripts (LSL)" name="LSL"/>
 			<menu_item_call label="Resetar scripts" name="Reset Scripts"/>
 			<menu_item_call label="Scripts em modo execução" name="Set Scripts to Running"/>
@@ -163,7 +163,7 @@
 		<menu_item_check label="Limitar distância da seleção" name="Limit Select Distance"/>
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
 		<menu_item_check label="Foto de alta resolução" name="HighResSnapshot"/>
-		<menu_item_check label="Compactar fotos para HD" name="QuietSnapshotsToDisk"/>
+		<menu_item_check label="Fotos sem barulho para HD" name="QuietSnapshotsToDisk"/>
 		<menu label="Ferramentas de desempenho" name="Performance Tools">
 			<menu_item_call label="Medidor de lag" name="Lag Meter"/>
 			<menu_item_check label="Barra de estatísticas" name="Statistics Bar"/>