merge with viewer-release

6 files changed, 501 insertions, 452 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
deleted file mode 100755
index b24c745bdd..0000000000
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="170"
- layout="topleft"
- name="floater_lagmeter"
- help_topic="floater_lagmeter"
- save_rect="true"
- title="LAG METER"
- width="350">
-    <floater.string
-     name="max_title_msg">
-        Lag Meter
-    </floater.string>
-    <floater.string
-     name="max_width_px">
-        360
-    </floater.string>
-    <floater.string
-     name="min_title_msg">
-        Lag
-    </floater.string>
-    <floater.string
-     name="min_width_px">
-        90
-    </floater.string>
-    <floater.string
-     name="client_text_msg">
-        Client
-    </floater.string>
-    <floater.string
-     name="client_frame_rate_critical_fps">
-        10
-    </floater.string>
-    <floater.string
-     name="client_frame_rate_warning_fps">
-        15
-    </floater.string>
-    <floater.string
-     name="client_frame_time_window_bg_msg">
-        Normal, window in background
-    </floater.string>
-    <floater.string
-     name="client_frame_time_critical_msg">
-        Client frame rate below [CLIENT_FRAME_RATE_CRITICAL]
-    </floater.string>
-    <floater.string
-     name="client_frame_time_warning_msg">
-        Client frame rate between [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING]
-    </floater.string>
-    <floater.string
-     name="client_frame_time_normal_msg">
-        Normal
-    </floater.string>
-    <floater.string
-     name="client_draw_distance_cause_msg">
-        Possible cause: Draw distance set too high
-    </floater.string>
-    <floater.string
-     name="client_texture_loading_cause_msg">
-        Possible cause: Images loading
-    </floater.string>
-    <floater.string
-     name="client_texture_memory_cause_msg">
-        Possible cause: Too many images in memory
-    </floater.string>
-    <floater.string
-     name="client_complex_objects_cause_msg">
-        Possible cause: Too many complex objects in scene
-    </floater.string>
-    <floater.string
-     name="network_text_msg">
-        Network
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_critical_pct">
-        10
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_warning_pct">
-        5
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_critical_msg">
-        Connection is dropping over [NETWORK_PACKET_LOSS_CRITICAL]% of packets
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_warning_msg">
-        Connection is dropping [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% of packets
-    </floater.string>
-    <floater.string
-     name="network_performance_normal_msg">
-        Normal
-    </floater.string>
-    <floater.string
-     name="network_ping_critical_ms">
-        600
-    </floater.string>
-    <floater.string
-     name="network_ping_warning_ms">
-        300
-    </floater.string>
-    <floater.string
-     name="network_ping_critical_msg">
-        Connection ping time is over [NETWORK_PING_CRITICAL] ms
-    </floater.string>
-    <floater.string
-     name="network_ping_warning_msg">
-        Connection ping time is [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-    </floater.string>
-    <floater.string
-     name="network_packet_loss_cause_msg">
-        Possible bad connection or &apos;Bandwidth&apos; pref too high.
-    </floater.string>
-    <floater.string
-     name="network_ping_cause_msg">
-        Possible bad connection or file-sharing app.
-    </floater.string>
-    <floater.string
-     name="server_text_msg">
-        Server
-    </floater.string>
-    <floater.string
-     name="server_frame_rate_critical_fps">
-        20
-    </floater.string>
-    <floater.string
-     name="server_frame_rate_warning_fps">
-        30
-    </floater.string>
-    <floater.string
-     name="server_single_process_max_time_ms">
-        20
-    </floater.string>
-    <floater.string
-     name="server_frame_time_critical_msg">
-        Simulator framerate below [SERVER_FRAME_RATE_CRITICAL]
-    </floater.string>
-    <floater.string
-     name="server_frame_time_warning_msg">
-        Simulator framerate between [SERVER_FRAME_RATE_CRITICAL] and [SERVER_FRAME_RATE_WARNING]
-    </floater.string>
-    <floater.string
-     name="server_frame_time_normal_msg">
-        Normal
-    </floater.string>
-    <floater.string
-     name="server_physics_cause_msg">
-        Possible Cause: Too many physical objects
-    </floater.string>
-    <floater.string
-     name="server_scripts_cause_msg">
-        Possible Cause: Too many scripted objects
-    </floater.string>
-    <floater.string
-     name="server_net_cause_msg">
-        Possible Cause: Too much network traffic
-    </floater.string>
-    <floater.string
-     name="server_agent_cause_msg">
-        Possible Cause: Too many moving people in region
-    </floater.string>
-    <floater.string
-     name="server_images_cause_msg">
-        Possible Cause: Too many image calculations
-    </floater.string>
-    <floater.string
-     name="server_generic_cause_msg">
-        Possible Cause: Simulator load too heavy
-    </floater.string>
-    <floater.string
-     name="smaller_label">
-        &gt;&gt;
-    </floater.string>
-    <floater.string
-     name="bigger_label">
-        &lt;&lt;
-    </floater.string>
-    <button
-     follows="top|left"
-     height="16"
-     image_selected="lag_status_good.tga"
-     image_unselected="lag_status_good.tga"
-     layout="topleft"
-     left="8"
-     name="client_lagmeter"
-     tab_stop="false"
-     tool_tip="Client lag status"
-     top="24"
-     width="16" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left_pad="3"
-     name="client"
-     top_delta="0"
-     width="128">
-        Client
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     type="string"
-     length="1"
-     bottom="40"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="client_text"
-     right="-10">
-        Normal
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     bottom="56"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="40"
-     name="client_lag_cause"
-     right="-32" />
-    <button
-     follows="top|left"
-     height="16"
-     image_selected="lag_status_good.tga"
-     image_unselected="lag_status_good.tga"
-     layout="topleft"
-     left="8"
-     name="network_lagmeter"
-     tab_stop="false"
-     tool_tip="Network lag status"
-     top="64"
-     width="16" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left_pad="3"
-     name="network"
-     top_delta="0"
-     width="128">
-        Network
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     type="string"
-     length="1"
-     bottom="80"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="network_text"
-     right="-10">
-        Normal
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     bottom="96"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="40"
-     name="network_lag_cause"
-     right="-32" />
-    <button
-     follows="top|left"
-     height="16"
-     image_selected="lag_status_good.tga"
-     image_unselected="lag_status_good.tga"
-     layout="topleft"
-     left="8"
-     name="server_lagmeter"
-     tab_stop="false"
-     tool_tip="Server lag status"
-     top="104"
-     width="16" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left_pad="3"
-     name="server"
-     top_delta="0"
-     width="60">
-        Server
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     type="string"
-     length="1"
-     bottom="120"
-     follows="left|top"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="server_text"
-     right="-10">
-        Normal
-    </text>
-    <text
-     invisiblity_control="LagMeterShrunk"
-     bottom="136"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="40"
-     name="server_lag_cause"
-     right="-32" />
-    <button
-     follows="left|top"
-     height="20"
-     label="&gt;&gt;"
-     layout="topleft"
-     left="10"
-     name="minimize"
-	 tool_tip="Toggle floater size"
-     top_delta="24"
-     width="40">
-        <button.commit_callback
-         function="LagMeter.ClickShrink" />
-    </button>
-</floater>
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
new file mode 100644
index 0000000000..246e8bb256
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater legacy_header_height="18"
+         can_resize="true"
+         height="400"
+         layout="topleft"
+         name="Scene Load Statistics"
+         save_rect="true"
+         save_visibility="true"
+         title="SCENE LOAD STATISTICS"
+         width="260">
+    <button follows="top|left"
+            top="20"
+            bottom="60"
+            left="10"
+            width="100"
+            label="Pause"
+            name="playpause"/>
+    <scroll_container follows="top|left|bottom|right"
+                      bottom="400"
+                      layout="topleft"
+                      left="0"
+                      name="statistics_scroll"
+                      reserve_scroll_corner="true"
+                      top="60"
+                      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="frame difference"
+                  label="Frame Pixel Difference"
+                  orientation="horizontal"
+                  unit_label="%"
+                  stat="FramePixelDifference"
+                  bar_max="100"
+                  tick_spacing="10"
+                  unit_scale="100"
+                  precision="0"/>
+        <stat_bar name="bandwidth"
+                  label="Bandwidth"
+                  orientation="horizontal"
+                  unit_label="kbps"
+                  stat="kbitstat"
+                  bar_max="5000"
+                  tick_spacing="500"
+                  precision="0"/>
+			  <stat_bar name="packet_loss"
+                  label="Packet Loss"
+                  orientation="horizontal"
+                  unit_label=" %"
+                  stat="packetslostpercentstat"
+                  bar_max="5"
+                  tick_spacing="0.5"
+                  precision="3"
+                  show_bar="false"
+                  show_mean="true"/>
+		  </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="objs"
+                    label="Total Objects"
+                    orientation="horizontal"
+                    unit_label=""
+                    stat="numobjectsstat"
+                    bar_max="50000"
+                    tick_spacing="5000"
+                    precision="0"
+                    show_bar="false"/>
+          <stat_bar name="newobjs"
+                    label="New Objects"
+                    orientation="horizontal"
+                    unit_label="/sec"
+                    stat="numnewobjectsstat"
+                    bar_max="2000"
+                    tick_spacing="200"
+                    show_bar="false"/>
+          <stat_bar name="object_cache_hits"
+                    label="Object Cache Hit Rate"
+                    orientation="horizontal"
+                    stat="object_cache_hits"
+                    bar_max="100"
+                    unit_label="%"
+                    tick_spacing="20"
+                    show_history="true"
+                    show_bar="false"/>
+			  </stat_view>
+<!--Texture Stats-->
+			  <stat_view name="texture"
+                   label="Texture"
+                   show_label="true">
+			    <stat_bar name="texture_cache_hits"
+                    label="Cache Hit Rate"
+                    orientation="horizontal"
+                    stat="texture_cache_hits"
+                    bar_max="100.f"
+                    unit_label="%"
+                    tick_spacing="20"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="texture_cache_read_latency"
+                    label="Cache Read Latency"
+                    orientation="horizontal"
+                    unit_label="msec"
+                    stat="texture_cache_read_latency"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="numimagesstat"
+                    label="Count"
+                    orientation="horizontal"
+                    stat="numimagesstat" 
+                    bar_max="8000.f" 
+                    tick_spacing="2000.f"
+                    show_bar="false"/>
+			    <stat_bar name="numrawimagesstat"
+                    label="Raw Count"
+                    orientation="horizontal"
+                    stat="numrawimagesstat"
+                    bar_max="8000.f" 
+                    tick_spacing="2000.f"
+                    show_bar="false"/>
+			  </stat_view>
+<!--Network Stats-->
+			  <stat_view name="network"
+                   label="Network"
+                   show_label="true"
+                   setting="OpenDebugStatNet">
+			    <stat_bar name="packetsinstat"
+                    label="Packets In"
+                    orientation="horizontal"
+                    stat="packetsinstat"
+                    unit_label="/sec" 
+                    bar_max="1024.f" 
+                    tick_spacing="128.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="packetsoutstat"
+                    label="Packets Out"
+                    orientation="horizontal"
+                    stat="packetsoutstat"
+                    unit_label="/sec"  
+                    bar_max="1024.f" 
+                    tick_spacing="128.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="objectkbitstat"
+                    label="Objects"
+                    orientation="horizontal"
+                    stat="objectkbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="texturekbitstat"
+                    label="Texture"
+                    orientation="horizontal"
+                    stat="texturekbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="assetkbitstat"
+                    label="Asset"
+                    orientation="horizontal"
+                    stat="assetkbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="layerskbitstat"
+                    label="Layers"
+                    orientation="horizontal"
+                    stat="layerskbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="actualinkbitstat"
+                    label="Actual In"
+                    orientation="horizontal"
+                    stat="actualinkbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="actualoutkbitstat"
+                    label="Actual Out"
+                    orientation="horizontal"
+                    stat="actualoutkbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="vfspendingoperations"
+                    label="VFS Pending Operations"
+                    orientation="horizontal"
+                    stat="vfspendingoperations"
+                    unit_label=" Ops."
+                    show_bar="false"/>
+			  </stat_view>
+		  </stat_view>
+<!--Sim Stats-->
+		  <stat_view name="sim"
+                 label="Simulator"
+                 show_label="true"
+                 setting="OpenDebugStatSim">
+			  <stat_bar name="simobjects"
+                  label="Objects"
+                  orientation="horizontal"
+                  stat="simobjects"
+                  precision="0"
+                  bar_max="30000.f" 
+                  tick_spacing="5000.f"
+                  show_bar="false"
+                  show_mean="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"/>
+			  <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"/>
+			  <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"/>
+			  <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"/>
+			  <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"/>
+			  <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"/>
+			  <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"/>
+			  <stat_view name="simperf"
+                   label="Time (ms)"
+                   show_label="true">
+			    <stat_bar name="simframemsec"
+                    label="Total Frame Time"
+                    orientation="horizontal"
+                    stat="simframemsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f" 
+                    tick_spacing="10.f"
+                    show_bar="false"
+                    show_mean="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"/>
+			    <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"/>
+			    <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"/>
+			    <stat_bar name="simagentmsec"
+                    label="Agent Time"
+                    orientation="horizontal"
+                    stat="simagentmsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f" 
+                    tick_spacing="10.f"
+                    show_bar="false"
+                    show_mean="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"/>
+			    <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"/>
+          <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"/>
+<!--2nd level time blocks under 'Details' second-->
+          <stat_view name="timedetails"
+                     label="Time Details (ms)"
+                     show_label="true">
+            <stat_bar name="simsimphysicsstepmsec"
+                      label="  Physics Step"
+                      orientation="horizontal"
+                      stat="simsimphysicsstepmsec"
+                      unit_label="ms"
+                      precision="3"
+                      bar_max="40.f"
+                      tick_spacing="10.f"
+                      show_bar="false"
+                      show_mean="false"/>
+            <stat_bar name="simsimphysicsshapeupdatemsec"
+                      label="  Update Phys Shapes"
+                      orientation="horizontal"
+                      stat="simsimphysicsshapeupdatemsec"
+                      unit_label="ms"
+                      precision="3"
+                      bar_max="40.f"
+                      tick_spacing="10.f"
+                      show_bar="false"
+                      show_mean="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"/>
+            <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"/>
+            <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"/>
+          </stat_view>
+			  </stat_view>
+		  </stat_view>
+    </container_view>
+  </scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index f9eb16d224..0493f487d4 100755
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -31,17 +31,17 @@
 		  <stat_view
 			 name="basic"
 			 label="Basic"
+       follows="left|top|right"
 			 show_label="true"
 			 setting="OpenDebugStatBasic">
 			<stat_bar
 			   name="fps"
 			   label="FPS"
 			   unit_label="fps"
-			   stat="fpsstat"
+			   stat="framesrendered"
 			   bar_min="0"
 			   bar_max="60"
 			   tick_spacing="6"
-			   label_spacing="12"
 			   precision="1"
 			   show_bar="true"
 			   show_history="true">
@@ -54,7 +54,6 @@
 			   bar_min="0"
 			   bar_max="5000"
 			   tick_spacing="500"
-			   label_spacing="1000"
 				 precision="0"
 			   show_bar="true"
 			   show_history="false">
@@ -67,9 +66,7 @@
 			   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>
@@ -81,10 +78,8 @@
 			   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>
@@ -92,11 +87,13 @@
       <stat_view
 			 name="advanced"
 			 label="Advanced"
+       follows="left|top|right"       
 			 show_label="true"
 			 setting="OpenDebugStatAdvanced">
 			<stat_view
 			   name="render"
 			   label="Render"
+         follows="left|top|right"
 			   show_label="true"
 			   setting="OpenDebugStatRender">
 			  <stat_bar
@@ -104,10 +101,10 @@
 				 label="KTris Drawn per Frame"
 				 unit_label="/fr"
 				 stat="trianglesdrawnstat"
+         unit_scale="0.001"
 				 bar_min="0"
 				 bar_max="10000"
 				 tick_spacing="1000"
-				 label_spacing="2000"
 				 precision="0"
 				 show_per_sec="false"
          show_bar="false">
@@ -116,11 +113,11 @@
 				 name="ktrissec"
 				 label="KTris Drawn per Sec"
 				 unit_label="/sec"
+         unit_scale="0.001"
 				 stat="trianglesdrawnstat"
 				 bar_min="0"
 				 bar_max="200000"
 				 tick_spacing="25000"
-				 label_spacing="50000"
 				 precision="0"
          show_bar="false">
         </stat_bar>
@@ -132,9 +129,7 @@
 				 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
@@ -145,8 +140,6 @@
 				 bar_min="0"
 				 bar_max="2000"
 				 tick_spacing="200"
-				 label_spacing="400"
-				 show_per_sec="true"
 				 show_bar="false">
 			  </stat_bar>
        <stat_bar
@@ -157,9 +150,7 @@
 				 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>
@@ -167,6 +158,7 @@
 			<stat_view
 			   name="texture"
 			   label="Texture"
+         follows="left|top|right"
 			   show_label="true">
 			  <stat_bar
 				 name="texture_cache_hits"
@@ -176,9 +168,7 @@
 				 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
@@ -189,9 +179,7 @@
 				 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
@@ -201,8 +189,6 @@
 				 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>
 
@@ -213,8 +199,6 @@
 				 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>
 
@@ -222,12 +206,12 @@
 				 name="gltexmemstat"
 				 label="GL Mem"
 				 stat="gltexmemstat"
+         unit_label="MB"
+         unit_scale="0.000001"
 				 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>
 
@@ -235,25 +219,25 @@
 				 name="formattedmemstat"
 				 label="Formatted Mem"
 				 stat="formattedmemstat"
+         unit_label="MB"
+         unit_scale="0.000001"
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" 
+				 precision="3"
          show_bar="false">
         </stat_bar>
 
 			  <stat_bar
 				 name="rawmemstat"
 				 label="Raw Mem"
+         unit_label="MB"
+         unit_scale="0.000001"
 				 stat="rawmemstat"
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" 
+				 precision="3"
          show_bar="false">
         </stat_bar>
 
@@ -261,12 +245,12 @@
 				 name="glboundmemstat"
 				 label="Bound Mem"
 				 stat="glboundmemstat"
+         unit_label="MB"
+         unit_scale="0.000001"
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" 
+				 precision="3"
          show_bar="false">
         </stat_bar>
 			</stat_view>
@@ -274,6 +258,7 @@
 			<stat_view
 			   name="network"
 			   label="Network"
+         follows="left|top|right"
 			   show_label="true"
 			   setting="OpenDebugStatNet">
 			  <stat_bar
@@ -284,7 +269,6 @@
          bar_min="0.f"
 				 bar_max="1024.f" 
 				 tick_spacing="128.f"
-				 label_spacing="256.f" 
 				 precision="1"
 				 show_bar="false">
 			  </stat_bar>
@@ -297,7 +281,6 @@
          bar_min="0.f"
 				 bar_max="1024.f" 
 				 tick_spacing="128.f"
-				 label_spacing="256.f" 
 				 precision="1"
 				 show_bar="false" >
 			  </stat_bar>
@@ -310,7 +293,6 @@
          bar_min="0.f"
          bar_max="1024.f"
          tick_spacing="128.f"
-         label_spacing="256.f"
          precision="1"
 				 show_bar="false" >
 			  </stat_bar>
@@ -323,7 +305,6 @@
          bar_min="0.f"
          bar_max="1024.f"
          tick_spacing="128.f"
-         label_spacing="256.f"
          precision="1"
 				 show_bar="false" >
 			  </stat_bar>
@@ -336,7 +317,6 @@
          bar_min="0.f"
          bar_max="1024.f"
          tick_spacing="128.f"
-         label_spacing="256.f"
          precision="1"
 				 show_bar="false" >
 			  </stat_bar>
@@ -349,7 +329,6 @@
          bar_min="0.f"
          bar_max="1024.f"
          tick_spacing="128.f"
-         label_spacing="256.f"
          precision="1"
 				 show_bar="false" >
 			  </stat_bar>
@@ -362,7 +341,6 @@
          bar_min="0.f"
          bar_max="1024.f"
          tick_spacing="128.f"
-         label_spacing="256.f"
          precision="1"
 				 show_bar="false"
 				 show_history="false" >
@@ -376,7 +354,6 @@
          bar_min="0.f"
          bar_max="1024.f"
          tick_spacing="128.f"
-         label_spacing="256.f"
          precision="1"
 				 show_bar="false"
 				 show_history="false">
@@ -387,7 +364,6 @@
 				 label="VFS Pending Operations"
 				 stat="vfspendingoperations"
 				 unit_label=" Ops."
-				 show_per_sec="false"
 				 show_bar="false" >
 			  </stat_bar>
 			</stat_view>
@@ -396,6 +372,7 @@
 		  <stat_view
 			 name="sim"
 			 label="Simulator"
+       follows="left|top|right"
 			 show_label="true"
 			 setting="OpenDebugStatSim">
 			<stat_bar
@@ -406,8 +383,6 @@
 			   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>
@@ -420,8 +395,6 @@
 			   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>
@@ -434,8 +407,6 @@
 			   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>
@@ -443,6 +414,7 @@
 			<stat_view
 			   name="physicsdetail"
 			   label="Physics Details"
+         follows="left|top|right"
 			   show_label="true">
 			  <stat_bar
 				 name="physicspinnedtasks"
@@ -452,8 +424,6 @@
 				 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>
@@ -466,8 +436,6 @@
 				 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>
@@ -481,8 +449,6 @@
 				 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>
@@ -496,8 +462,6 @@
 			   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>
@@ -510,8 +474,6 @@
 			   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>
@@ -524,8 +486,6 @@
 			   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>
@@ -538,8 +498,6 @@
 			   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>
@@ -552,8 +510,6 @@
 			   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>
@@ -566,8 +522,6 @@
 			   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>
@@ -579,9 +533,7 @@
             bar_min="0"
             bar_max="100"
             tick_spacing="10"
-            label_spacing="20"
             precision="3"
-            show_per_sec="false"
             show_bar="false"
             show_mean="true">
         </stat_bar>
@@ -595,8 +547,6 @@
 			   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>
@@ -604,6 +554,7 @@
         <stat_view
             name="simpathfinding"
             label="Pathfinding"
+            follows="left|top|right"
             show_label="true">
           <stat_bar
               name="simsimaistepmsec"
@@ -614,8 +565,6 @@
               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>
@@ -628,8 +577,6 @@
               bar_min="0"
               bar_max="45"
               tick_spacing="4"
-              label_spacing="8"
-              show_per_sec="false"
               show_bar="false">
           </stat_bar>
           <stat_bar
@@ -640,9 +587,7 @@
               bar_min="0"
               bar_max="100"
               tick_spacing="10"
-              label_spacing="20"
               precision="1"
-              show_per_sec="false"
               show_bar="false"
               show_mean="true">
           </stat_bar>
@@ -657,8 +602,6 @@
 			   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>
@@ -672,8 +615,6 @@
 			   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>
@@ -686,8 +627,6 @@
 			   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>
@@ -700,8 +639,6 @@
 			   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>
@@ -715,8 +652,6 @@
 			   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>
@@ -724,6 +659,7 @@
 			<stat_view
 			   name="simperf"
 			   label="Time (ms)"
+         follows="left|top|right"
 			   show_label="true">
 			  <stat_bar
 				 name="simframemsec"
@@ -734,8 +670,6 @@
 				 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>
@@ -749,8 +683,6 @@
 				 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>
@@ -764,8 +696,6 @@
 				 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>
@@ -779,8 +709,6 @@
 				 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>
@@ -794,8 +722,6 @@
 				 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>
@@ -809,8 +735,6 @@
 				 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>
@@ -824,8 +748,6 @@
 				 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>
@@ -839,8 +761,6 @@
          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>
@@ -848,6 +768,7 @@
           <stat_view
  			     name="timedetails"
 			     label="Time Details (ms)"
+           follows="left|top|right"
 			     show_label="true">
             <stat_bar
              name="simsimphysicsstepmsec"
@@ -858,8 +779,6 @@
              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>
@@ -872,8 +791,6 @@
              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>
@@ -886,8 +803,6 @@
              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>
@@ -900,8 +815,6 @@
              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>
@@ -914,8 +827,6 @@
              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>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a11cd13fdb..d50b7b18e7 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1300,7 +1300,7 @@
              parameter="hud" />
         </menu_item_call>-->
 		<menu_item_separator/>
-		
+
 		<menu_item_call
              label="User’s guide"
              name="User’s guide">
@@ -1475,6 +1475,14 @@
                  function="Floater.Toggle"
                  parameter="stats" />
             </menu_item_check>
+            <menu_item_call
+             label="Scene Load Statistics"
+             name="Scene Load Statistics"
+             shortcut="control|shift|2">
+                <on_click
+                 function="Floater.Show"
+                 parameter="scene_load_stats" />
+            </menu_item_call>
       <menu_item_check
         label="Show Draw Weight for Avatars"
         name="Avatar Rendering Cost">
@@ -2080,6 +2088,16 @@
                function="Advanced.ToggleConsole"
                parameter="scene view" />
             </menu_item_check>
+            <menu_item_check
+                 label="Scene Loading Monitor"
+                 name="Scene Loading Monitor">
+              <menu_item_check.on_check
+               function="Advanced.CheckConsole"
+               parameter="scene monitor" />
+              <menu_item_check.on_click
+               function="Advanced.ToggleConsole"
+               parameter="scene monitor" />
+            </menu_item_check>
             <menu_item_call
               enabled="false"
               visible="false"
@@ -2831,6 +2849,16 @@
                  function="ToggleControl"
                  parameter="RenderHoverGlowEnable" />
             </menu_item_check>
+          <menu_item_separator />
+          
+          <menu_item_call
+            enabled="true"
+            label="Clear Cache Immediately"
+            name="Cache Clear">
+            <menu_item_call.on_click
+             function="Develop.ClearCache" />
+          </menu_item_call>
+          
         </menu>
 
         <menu
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 970a11c6c4..540618ef9a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6923,7 +6923,7 @@ Do not allow access if you do not fully understand why it wants access to your a
 [FOOTERTEXT]
     </footer>
   </notification>
-	
+
 	<notification
 	 icon="notify.tga"
 	 name="UnknownScriptQuestion"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3b57ff5fd6..e0a85877eb 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -416,7 +416,7 @@ Please try logging in again in a minute.</string>
 	<string name="OverrideYourAnimations">Replace your default animations</string>
 	<string name="ScriptReturnObjects">Return objects on your behalf</string>
 	<string name="UnknownScriptPermission">(unknown)!</string>
-	
+
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">General</string>
 	<string name="SIM_ACCESS_MATURE">Moderate</string>