Merge branch 'master' into DRTVWR-483

# Conflicts:
#	indra/newview/llviewermenu.cpp

1 files changed, 63 insertions, 82 deletions

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 35d4385487..2abd8ec5c0 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
@@ -36,16 +36,14 @@
                   stat="FramePixelDifference"
                   bar_max="100"
                   tick_spacing="10"
-                  unit_scale="100"
-                  precision="0"/>
+                  unit_scale="100"/>
         <stat_bar name="bandwidth"
                   label="UDP Data Received"
                   orientation="horizontal"
                   unit_label="kbps"
                   stat="activemessagedatareceived"
                   bar_max="5000"
-                  tick_spacing="500"
-                  precision="0"/>
+                  tick_spacing="500"/>
 			  <stat_bar name="packet_loss"
                   label="Packet Loss"
                   orientation="horizontal"
@@ -53,9 +51,7 @@
                   stat="packetslostpercentstat"
                   bar_max="5"
                   tick_spacing="0.5"
-                  precision="3"
-                  show_bar="false"
-                  show_mean="true"/>
+                  show_bar="false"/>
 		  </stat_view>
 <!--Advanced Section-->
       <stat_view name="advanced"
@@ -73,7 +69,6 @@
                     stat="numobjectsstat"
                     bar_max="50000"
                     tick_spacing="5000"
-                    precision="0"
                     show_bar="false"/>
           <stat_bar name="newobjs"
                     label="New Objects"
@@ -109,12 +104,48 @@
           <stat_bar name="texture_cache_read_latency"
                     label="Cache Read Latency"
                     orientation="horizontal"
-                    unit_label="msec"
+                    unit_label="sec"
                     stat="texture_cache_read_latency"
                     bar_max="1000.f"
                     tick_spacing="100"
                     show_history="true"
                     show_bar="false"/>
+          <stat_bar name="texture_decode_latency"
+                    label="Cache Decode Latency"
+                    orientation="horizontal"
+                    unit_label="sec"
+                    stat="texture_decode_latency"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="texture_decode_latency"
+                    label="Cache Write Latency"
+                    orientation="horizontal"
+                    unit_label="sec"
+                    stat="texture_write_latency"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="texture_fetch_latency"
+                    label="Cache Fetch Latency"
+                    orientation="horizontal"
+                    unit_label="sec"
+                    stat="texture_fetch_latency"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="texture_fetch_time"
+                    label="Cache Fetch Time"
+                    orientation="horizontal"
+                    unit_label="sec"
+                    stat="texture_fetch_time"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    show_history="true"
+                    show_bar="false"/>
           <stat_bar name="numimagesstat"
                     label="Count"
                     orientation="horizontal"
@@ -142,7 +173,6 @@
                     unit_label="/sec" 
                     bar_max="1024.f" 
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="packetsoutstat"
                     label="Packets Out"
@@ -151,7 +181,6 @@
                     unit_label="/sec"  
                     bar_max="1024.f" 
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="objectdatareceived"
                     label="Objects"
@@ -160,7 +189,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="texturedatareceived"
                     label="Texture"
@@ -169,7 +197,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="assetudpdatareceived"
                     label="Asset"
@@ -178,7 +205,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="layersdatareceived"
                     label="Layers"
@@ -187,7 +213,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="messagedatain"
                     label="Actual In"
@@ -196,7 +221,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="messagedataout"
                     label="Actual Out"
@@ -205,7 +229,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			  </stat_view>
 		  </stat_view>
@@ -218,77 +241,61 @@
                   label="Objects"
                   orientation="horizontal"
                   stat="simobjects"
-                  precision="0"
                   bar_max="30000.f" 
                   tick_spacing="5000.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simactiveobjects"
                   label="Active Objects"
                   orientation="horizontal"
                   stat="simactiveobjects"
-                  precision="0"
                   bar_max="5000.f" 
                   tick_spacing="750.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simactivescripts"
                   label="Active Scripts"
                   orientation="horizontal"
                   stat="simactivescripts"
-                  precision="0"
                   bar_max="15000.f" 
                   tick_spacing="1875.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="siminpps"
                   label="Packets In"
                   orientation="horizontal"
                   stat="siminpps"
                   unit_label="pps"
-                  precision="0"
                   bar_max="2000.f" 
                   tick_spacing="250.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simoutpps"
                   label="Packets Out"
                   orientation="horizontal"
                   stat="simoutpps"
                   unit_label="pps" 
-                  precision="0"
                   bar_max="2000.f" 
                   tick_spacing="250.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simpendingdownloads"
                   label="Pending Downloads"
                   orientation="horizontal"
                   stat="simpendingdownloads"
-                  precision="0"
                   bar_max="800.f" 
                   tick_spacing="100.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simpendinguploads"
                   label="Pending Uploads"
                   orientation="horizontal"
                   stat="simpendinguploads"
-                  precision="0"
                   bar_max="100.f" 
                   tick_spacing="25.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simtotalunackedbytes"
                   label="Total Unacked Bytes"
                   orientation="horizontal"
                   stat="simtotalunackedbytes"
                   unit_label="kb"
-                  precision="1"
                   bar_max="100000.f" 
                   tick_spacing="25000.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_view name="simperf"
                    label="Time (ms)"
                    show_label="true">
@@ -297,81 +304,65 @@
                     orientation="horizontal"
                     stat="simframemsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simnetmsec"
                     label="Net Time"
                     orientation="horizontal"
                     stat="simnetmsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simsimphysicsmsec"
                     label="Physics Time"
                     orientation="horizontal"
                     stat="simsimphysicsmsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simsimothermsec"
                     label="Simulation Time"
                     orientation="horizontal"
                     stat="simsimothermsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simagentmsec"
                     label="Agent Time"
                     orientation="horizontal"
                     stat="simagentmsec"
                     unit_label="ms"
-                    precision="3"
-                    bar_max="40.f" 
+                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simimagesmsec"
                     label="Images Time"
                     orientation="horizontal"
                     stat="simimagesmsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simscriptmsec"
                     label="Script Time"
                     orientation="horizontal"
                     stat="simscriptmsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
           <stat_bar name="simsparemsec"
                     label="Spare Time"
                     orientation="horizontal"
                     stat="simsparemsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f"
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 <!--2nd level time blocks under 'Details' second-->
           <stat_view name="timedetails"
                      label="Time Details (ms)"
@@ -381,51 +372,41 @@
                       orientation="horizontal"
                       stat="simsimphysicsstepmsec"
                       unit_label="ms"
-                      precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
             <stat_bar name="simsimphysicsshapeupdatemsec"
                       label="  Update Phys Shapes"
                       orientation="horizontal"
                       stat="simsimphysicsshapeupdatemsec"
                       unit_label="ms"
-                      precision="3"
-                      bar_max="40.f"
+                        bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
             <stat_bar name="simsimphysicsothermsec"
                       label="  Physics Other"
                       orientation="horizontal"
                       stat="simsimphysicsothermsec"
                       unit_label="ms"
-                      precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
             <stat_bar name="simsleepmsec"
                       label="  Sleep Time"
                       orientation="horizontal"
                       stat="simsleepmsec"
                       unit_label="ms"
-                      precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
             <stat_bar name="simpumpiomsec"
                       label="  Pump IO"
                       orientation="horizontal"
                       stat="simpumpiomsec"
                       unit_label="ms"
-                      precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
           </stat_view>
 			  </stat_view>
 		  </stat_view>