From b3e9c46c94dad0c81a5adcb9152521b5368c66a7 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 29 Aug 2012 22:50:56 -0700
Subject: SH-3275 WIP Run viewer metrics for object update messages further
 cleanup of LLStat removed llfloaterlagmeter

---
 .../skins/default/xui/da/floater_lagmeter.xml      | 151 ---------
 .../skins/default/xui/de/floater_lagmeter.xml      | 151 ---------
 .../skins/default/xui/en/floater_lagmeter.xml      | 336 ---------------------
 .../skins/default/xui/es/floater_lagmeter.xml      | 154 ----------
 .../skins/default/xui/fr/floater_lagmeter.xml      | 151 ---------
 .../skins/default/xui/it/floater_lagmeter.xml      | 154 ----------
 .../skins/default/xui/ja/floater_lagmeter.xml      | 151 ---------
 .../skins/default/xui/pl/floater_lagmeter.xml      | 151 ---------
 .../skins/default/xui/pt/floater_lagmeter.xml      | 154 ----------
 .../skins/default/xui/ru/floater_lagmeter.xml      | 151 ---------
 .../skins/default/xui/tr/floater_lagmeter.xml      | 151 ---------
 .../skins/default/xui/zh/floater_lagmeter.xml      | 151 ---------
 12 files changed, 2006 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/da/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/de/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_lagmeter.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_lagmeter.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/da/floater_lagmeter.xml b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
deleted file mode 100644
index 149d174c34..0000000000
--- a/indra/newview/skins/default/xui/da/floater_lagmeter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="LAG METER">
-	<floater.string name="max_title_msg">
-		Lag måler
-	</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">
-		Klient
-	</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, vindue i baggrund
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		Klients billeder/sek under [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		Klients billeder/sek mellem [CLIENT_FRAME_RATE_CRITICAL] og [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">
-		Mulig årsag: &apos;Vis afstand&apos; sat for højt i grafik indstillinger
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		Mulig årsag: Billeder hentes
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		Mulig årsag: For mange billeder i hukommelse
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		Mulig årsag: For mange komplekse objekter i scenariet
-	</floater.string>
-	<floater.string name="network_text_msg">
-		Netværk
-	</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">
-		Forbindelsen mister over [NETWORK_PACKET_LOSS_CRITICAL]% pakker
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		Forbindelsen mister [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% pakker
-	</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">
-		Forbindelsens ping tider er over [NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		Forbindelsens ping tider er [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		Muligvis dårlig forbindelse eller &apos;båndbredde&apos; sat for højt i netværksopsætning.
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		Muligvis dårlig forbindelse eller fil delings program.
-	</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 er under [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		Simulator framerate er mellem [SERVER_FRAME_RATE_CRITICAL] og [SERVER_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		Normal
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		Mulig årsag: For mange fysiske objekter
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		Mulig årsag: For mange objekter med script
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		Mulig årsag: For meget netværks trafik
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		Mulig årsag: For mange avatarer i bevægelse i regionen
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		Mulig årsag: For mange billed udregninger
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		Mulig årsag: Simulator belastning for stor
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status for klient lag"/>
-	<text name="client">
-		Klient
-	</text>
-	<text name="client_text">
-		Normal
-	</text>
-	<button label="" label_selected="" name="network_lagmeter" tool_tip="Network lag status"/>
-	<text name="network">
-		Netværk
-	</text>
-	<text name="network_text">
-		Normal
-	</text>
-	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status for server lag"/>
-	<text name="server">
-		Server
-	</text>
-	<text name="server_text">
-		Normal
-	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="Ændre størrelse"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
deleted file mode 100644
index 45ff37c147..0000000000
--- a/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="LAG METER">
-	<floater.string name="max_title_msg">
-		Lag-Anzeige
-	</floater.string>
-	<floater.string name="max_width_px">
-		350
-	</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, Fenster im Hintergrund
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		Client-Frame-Rate unter [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		Client-Frame-Rate zwischen [CLIENT_FRAME_RATE_CRITICAL] und [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">
-		Mögliche Ursache: Sichtweite zu groß
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		Mögliche Ursache: Bilder werden geladen
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		Mögliche Ursache: Zu viele Bilder im Speicher
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		Mögliche Ursache: Zu viele komplexe Objekte in der Szene
-	</floater.string>
-	<floater.string name="network_text_msg">
-		Netzwerk
-	</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">
-		Paketverlust der Verbindung übersteigt [NETWORK_PACKET_LOSS_CRITICAL]%
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		Paketverlust der Verbindung liegt bei [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]%
-	</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">
-		Ping-Zeit der Verbindung übersteigt [NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		Ping-Zeit der Verbindung liegt bei [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		Möglicherweise schlechte Verbindung oder zu hoher Wert für „Bandbreite“.
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		Möglicherweise schlechte Verbindung oder File-Sharing-Anwendung.
-	</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-Frame-Rate liegt unter [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		Simulator-Frame-Rate liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		Normal
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		Mögliche Ursache: Zu viele physische Objekte
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		Mögliche Ursache: Zu viele geskriptete Objekte
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		Mögliche Ursache: Zu viel Netzwerktraffic
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		Mögliche Ursache: Zu viele Personen in Bewegung in der Region
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		Mögliche Ursache: Zu viele Bildberechnungen
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		Mögliche Ursache: Zu hohe Simulator-Last
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button name="client_lagmeter" tool_tip="Client-Lag-Status"/>
-	<text name="client">
-		Client
-	</text>
-	<text name="client_text">
-		Normal
-	</text>
-	<button name="network_lagmeter" tool_tip="Netzwerk-Lag-Status"/>
-	<text name="network">
-		Netzwerk
-	</text>
-	<text name="network_text">
-		Normal
-	</text>
-	<button name="server_lagmeter" tool_tip="Server-Lag-Status"/>
-	<text name="server">
-		Server
-	</text>
-	<text name="server_text">
-		Normal
-	</text>
-	<button label="&gt;&gt; " name="minimize" tool_tip="Fenstergröße ändern"/>
-</floater>
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 100644
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/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
deleted file mode 100644
index 227689a194..0000000000
--- a/indra/newview/skins/default/xui/es/floater_lagmeter.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="MEDIDOR DEL LAG">
-	<floater.string name="max_title_msg">
-		Medidor del lag
-	</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">
-		Cliente
-	</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, ventana en segundo plano
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		Frames del cliente valorados por debajo de [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		Frames del cliente valorados entre [CLIENT_FRAME_RATE_CRITICAL] y [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">
-		Posible causa: distancia de dibujo fijada muy alta
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		Posible causa: imágenes cargándose
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		Posible causa: demasiadas imágenes en la memoria
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		Posible causa: demasiados objetos complejos en la escena
-	</floater.string>
-	<floater.string name="network_text_msg">
-		Red
-	</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">
-		La conexión deja caer más del [NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		La conexión deja caer [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
-	</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">
-		El tiempo de conexión -ping- supera los [NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		El tiempo de conexión -ping- es de [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		Quizá una mala conexión o un ancho de banda fijado demasiado alto.
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		Quizá una mala conexión o una aplicación de archivos compartidos.
-	</floater.string>
-	<floater.string name="server_text_msg">
-		Servidor
-	</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">
-		Frecuencia (framerate) por debajo de [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		Frecuencia (framerate) entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		Normal
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		Posible causa: demasiados objetos físicos
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		Posible causa: demasiados objetos con script
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		Posible causa: demasiado tráfico en la red
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		Posible causa: demasiada gente moviéndose en la región
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		Posible causa: demasiados cálculos de imáganes
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		Posible causa: carga del simulador muy pesada
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button label="" label_selected="" name="client_lagmeter" tool_tip="Estado del lag del cliente"/>
-	<text name="client">
-		Cliente
-	</text>
-	<text font="SansSerifSmall" name="client_text">
-		Normal
-	</text>
-	<text left="30" name="client_lag_cause" right="-10"/>
-	<button label="" label_selected="" name="network_lagmeter" tool_tip="Estado del lag de la red"/>
-	<text name="network">
-		Red
-	</text>
-	<text font="SansSerifSmall" name="network_text">
-		Normal
-	</text>
-	<text left="30" name="network_lag_cause" right="-10"/>
-	<button label="" label_selected="" name="server_lagmeter" tool_tip="Estado del lag del servidor"/>
-	<text name="server">
-		Servidor
-	</text>
-	<text font="SansSerifSmall" name="server_text">
-		Normal
-	</text>
-	<text left="30" name="server_lag_cause" right="-32"/>
-	<button label="&gt;&gt;" name="minimize" tool_tip="Cambia el tamaño de la ventana"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
deleted file mode 100644
index 39a861d8bd..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="MESURE DU LAG">
-	<floater.string name="max_title_msg">
-		Mesure du lag
-	</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, fenêtre en arrière-plan
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		Taux de défilement [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		Taux de défilement entre [CLIENT_FRAME_RATE_CRITICAL] et [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">
-		Cause possible : limite d&apos;affichage trop élevée
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		Cause possible : images en cours de chargement
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		Cause possible : trop d&apos;images en mémoire
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		Cause possible : trop d&apos;objets complexes
-	</floater.string>
-	<floater.string name="network_text_msg">
-		Réseau
-	</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">
-		La connexion perd plus de [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		La connexion perd entre [NETWORK_PACKET_LOSS_WARNING] % et [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
-	</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">
-		Connexion ping > [NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		Connexion ping entre [NETWORK_PING_WARNING] et [NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		Mauvaise connexion possible ou réglage de la bande passante trop élevé.
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		Mauvaise connexion possible ou app. de partage des fichiers
-	</floater.string>
-	<floater.string name="server_text_msg">
-		Serveur
-	</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">
-		Défilement du simulateur &lt; [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		Défilement simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		Normal
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		Cause possible : trop d&apos;objets physiques
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		Cause possible : trop d&apos;objets scriptés
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		Cause possible : trop de trafic réseau
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		Cause possible : trop de personnes en mouvement
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		Cause possible : trop de calculs d&apos;images
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		Cause possible : charge simulateur trop lourde
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button name="client_lagmeter" tool_tip="Statut du lag client"/>
-	<text name="client">
-		Client
-	</text>
-	<text name="client_text">
-		Normal
-	</text>
-	<button name="network_lagmeter" tool_tip="Statut du lag réseau"/>
-	<text name="network">
-		Réseau
-	</text>
-	<text name="network_text">
-		Normal
-	</text>
-	<button name="server_lagmeter" tool_tip="Statut du lag serveur"/>
-	<text name="server">
-		Serveur
-	</text>
-	<text name="server_text">
-		Normal
-	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="Activer/désactiver la taille du floater"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_lagmeter.xml b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
deleted file mode 100644
index f7b2b1ab4a..0000000000
--- a/indra/newview/skins/default/xui/it/floater_lagmeter.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="MISURATORE LAG">
-	<floater.string name="max_title_msg">
-		Misuratore del lag
-	</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">
-		Programma in locale
-	</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">
-		Normale, finestra sullo sfondo
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		Velocità dei frame al di sotto di [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		Velocità dei frame tra [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="client_frame_time_normal_msg">
-		Normale
-	</floater.string>
-	<floater.string name="client_draw_distance_cause_msg">
-		Possibile causa: Campo visivo impostato troppo alto
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		Possibile causa: Caricamento immagini
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		Possibile causa: Troppe immagini in memoria
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		Possibile causa: Troppi oggetti complessi intorno
-	</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">
-		La connessione sta calando al di sotto del [NETWORK_PACKET_LOSS_CRITICAL]% di pacchetti
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		La connessione sta calando tra il [NETWORK_PACKET_LOSS_WARNING]% e il [NETWORK_PACKET_LOSS_CRITICAL]% di pacchetti
-	</floater.string>
-	<floater.string name="network_performance_normal_msg">
-		Normale
-	</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">
-		Il tempo di ping della connessione è al di sopra di [NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		Il tempo di ping della connessione è tra [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		Possibile cattiva connessione o la larghezza di banda impostata nelle preferenze troppo alta.
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		Possibile cattiva connessione o l&apos;apertura di un programma di scambio files.
-	</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">
-		Velocità dei frame al di sotto di [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		Velocità dei frame tra [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		Normale
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		Possibile causa: troppi oggetti fisici
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		Possibile causa: troppi oggetti scriptati
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		Possibile causa: eccessivo traffico sulla rete
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		Possibile causa: troppi residenti in movimento nella regione
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		Possibile causa: troppe elaborazioni di immagini
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		Possibile causa: carico eccessivo del simulatore
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button label="" label_selected="" name="client_lagmeter" tool_tip="Stato del lag del programma in locale"/>
-	<text name="client">
-		Client
-	</text>
-	<text font="SansSerifSmall" left="145" name="client_text">
-		Normale
-	</text>
-	<text left="30" name="client_lag_cause" right="-10"/>
-	<button label="" label_selected="" name="network_lagmeter" tool_tip="Stato del lag del network"/>
-	<text name="network">
-		Rete
-	</text>
-	<text font="SansSerifSmall" name="network_text">
-		Normale
-	</text>
-	<text left="30" name="network_lag_cause" right="-10"/>
-	<button label="" label_selected="" name="server_lagmeter" tool_tip="Stato del lag del server"/>
-	<text name="server">
-		Server
-	</text>
-	<text font="SansSerifSmall" name="server_text">
-		Normale
-	</text>
-	<text left="30" name="server_lag_cause" right="-32"/>
-	<button label="&gt;&gt;" name="minimize" tool_tip="Cambia dimensioni floater"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
deleted file mode 100644
index e3546cd837..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="ラグメーター">
-	<floater.string name="max_title_msg">
-		ラグ メーター
-	</floater.string>
-	<floater.string name="max_width_px">
-		350
-	</floater.string>
-	<floater.string name="min_title_msg">
-		ラグ
-	</floater.string>
-	<floater.string name="min_width_px">
-		90
-	</floater.string>
-	<floater.string name="client_text_msg">
-		クライアント
-	</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">
-		ノーマル、ウィンドウは背景に
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		クライアント フレームレート ＜ [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		クライアント フレームレート: [CLIENT_FRAME_RATE_CRITICAL] ～ [CLIENT_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="client_frame_time_normal_msg">
-		ノーマル
-	</floater.string>
-	<floater.string name="client_draw_distance_cause_msg">
-		考えられる原因: 描画距離の設定が大きすぎる
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		考えられる原因: 画像のロード中
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		考えられる原因: メモリ内の画像数が多すぎる
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		考えられる原因: 画面に含まれる複雑なオブジェクトが多すぎる
-	</floater.string>
-	<floater.string name="network_text_msg">
-		ネットワーク
-	</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">
-		接続でドロップされるパケットの割合: ＞ [NETWORK_PACKET_LOSS_CRITICAL]
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		接続でドロップされるパケットの割合:[NETWORK_PACKET_LOSS_WARNING] ～ [NETWORK_PACKET_LOSS_CRITICAL]
-	</floater.string>
-	<floater.string name="network_performance_normal_msg">
-		ノーマル
-	</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">
-		接続の ping 時間: ＞ [NETWORK_PING_CRITICAL] ミリ秒
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		接続の ping 時間: [NETWORK_PING_WARNING] ～ [NETWORK_PING_CRITICAL] ミリ秒
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		接続不良になっているか、帯域幅設定が高すぎます。
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		接続不良になっているか、ファイル共有アプリケーションに問題があります。
-	</floater.string>
-	<floater.string name="server_text_msg">
-		サーバー
-	</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">
-		シミュレーターのフレームレート: ＜ [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		シミュレーターのフレームレート: [SERVER_FRAME_RATE_CRITICAL] ～ [SERVER_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		ノーマル
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		考えられる原因: 物理的オブジェクトが多すぎる
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		考えられる原因: スクリプトを含むオブジェクトが多すぎる
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		考えられる原因: ネットワーク トラフィック過大
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		考えられる原因: 地域内にて動いているアバターが多すぎる
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		考えられる原因: 画像計算が多すぎる
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		考えられる原因: シミュレーターの過負荷
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button name="client_lagmeter" tool_tip="クライアント ラグ ステータス"/>
-	<text name="client">
-		クライアント
-	</text>
-	<text name="client_text">
-		ノーマル
-	</text>
-	<button name="network_lagmeter" tool_tip="ネットワーク ラグ ステータス"/>
-	<text name="network">
-		ネットワーク
-	</text>
-	<text name="network_text">
-		ノーマル
-	</text>
-	<button name="server_lagmeter" tool_tip="サーバー ラグ ステータス"/>
-	<text name="server">
-		サーバー
-	</text>
-	<text name="server_text">
-		ノーマル
-	</text>
-	<button label="&gt;&gt; " name="minimize" tool_tip="フローターのサイズをトグル"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
deleted file mode 100644
index 8038550bcb..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="POMIAR LAGÓW">
-	<floater.string name="max_title_msg">
-		Pomiar lagów
-	</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">
-		Klient
-	</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">
-		W normie, okno w tle
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		Ilość klatek na sekundę klienta poniżej [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		Ilość klatek na sekundę pomiędzy [CLIENT_FRAME_RATE_CRITICAL] i [CLIENT_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="client_frame_time_normal_msg">
-		W normie
-	</floater.string>
-	<floater.string name="client_draw_distance_cause_msg">
-		Przyczyna: dystans rysowania jest za wysoki
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		Przyczyna: ładowanie obrazu
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		Przyczyna: za dużo obrazów w pamięci
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		Przyczyna: za dużo złożonych obiektów
-	</floater.string>
-	<floater.string name="network_text_msg">
-		Sieć
-	</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">
-		Utrata pakietów przekracza [NETWORK_PACKET_LOSS_CRITICAL]%
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		Utrata pakietów przekracza [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]%
-	</floater.string>
-	<floater.string name="network_performance_normal_msg">
-		W normie
-	</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">
-		Fatalny ping - [NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		Wolny ping - [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		Złe połączenie lub przepustowość.
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		Złe połączenie lub aplikacja współdzieląca pliki.
-	</floater.string>
-	<floater.string name="server_text_msg">
-		Serwer
-	</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">
-		Ilość klatek na sekundę poniżej [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		Ilość klatek na sekundę pomiędzy [SERVER_FRAME_RATE_CRITICAL] i [SERVER_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		W normie
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		Przyczyna: za dużo obiektów fizycznych
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		Przyczyna: za dużo obieków skryptowanych
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		Przyczyna: za duży ruch w sieci
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		Przyczyna: za dużo poruszających się awatarów w regionie
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		Przyczyna: za dużo kalkulacji obrazu
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		Przyczyna: symulator ładuje się zbyt powoli
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status lagów klienta"/>
-	<text name="client">
-		Klient
-	</text>
-	<text name="client_text">
-		W normie
-	</text>
-	<button label="" label_selected="" name="network_lagmeter" tool_tip="Network lag status"/>
-	<text name="network">
-		Sieć
-	</text>
-	<text name="network_text">
-		W normie
-	</text>
-	<button label="" label_selected="" name="server_lagmeter" tool_tip="Server lag status"/>
-	<text name="server">
-		Serwer
-	</text>
-	<text name="server_text">
-		W normie
-	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="Złącz rozmiar pliku xml"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
deleted file mode 100644
index 9932318293..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="LAG - Índice">
-	<floater.string name="max_title_msg">
-		Medidor de Atraso
-	</floater.string>
-	<floater.string name="max_width_px">
-		360
-	</floater.string>
-	<floater.string name="min_title_msg">
-		Atraso
-	</floater.string>
-	<floater.string name="min_width_px">
-		90
-	</floater.string>
-	<floater.string name="client_text_msg">
-		Cliente
-	</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, janela por baixo
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [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">
-		Causa possível: Distância de desenho ajustada muito alta
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		Causa possível: Carregamento de Imagens
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		Causa possível: Muitas imagens na memória
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		Causa possível: Muitos objetos complexos na cena
-	</floater.string>
-	<floater.string name="network_text_msg">
-		Rede
-	</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">
-		Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
-	</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">
-		Tempo de conexão de ping é cerca de  [NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		Possível conexão ruim ou &apos;Largura de Banda&apos; escolhida muito alta.
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		Possível conexão ruim ou aplicativos compartilhando arquivos.
-	</floater.string>
-	<floater.string name="server_text_msg">
-		Servidor
-	</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">
-		Taxa de quadros abaixo de [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		Taxa de quadros entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		Normal
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		Causa possível: Muitos objetos físicos
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		Causa possível: Muitos objetos com scripts
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		Causa possível: Muito tráfego na rede
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		Causa possível: Muitas pessoas se movendo na região
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		Causa possível: Muitos cálculos de imagem
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		Causa possível: Carga no simulador muito pesada
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
-	<text name="client">
-		Cliente
-	</text>
-	<text font="SansSerifSmall" name="client_text">
-		Normal
-	</text>
-	<text left="30" name="client_lag_cause" right="-10"/>
-	<button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
-	<text name="network">
-		Rede
-	</text>
-	<text font="SansSerifSmall" name="network_text">
-		Normal
-	</text>
-	<text left="30" name="network_lag_cause" right="-10"/>
-	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
-	<text name="server">
-		Servidor
-	</text>
-	<text font="SansSerifSmall" name="server_text">
-		Normal
-	</text>
-	<text left="30" name="server_lag_cause" right="-32"/>
-	<button label="&gt;&gt;" name="minimize" tool_tip="Alternar o tamanho da janela"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
deleted file mode 100644
index c420006a03..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="УРОВЕНЬ ЛАГОВ">
-	<floater.string name="max_title_msg">
-		Уровень лагов
-	</floater.string>
-	<floater.string name="max_width_px">
-		360
-	</floater.string>
-	<floater.string name="min_title_msg">
-		Лаг
-	</floater.string>
-	<floater.string name="min_width_px">
-		90
-	</floater.string>
-	<floater.string name="client_text_msg">
-		Клиент
-	</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">
-		Нормально, окно в фоне
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		Частота кадров клиента ниже [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		Частота кадров клиента от [CLIENT_FRAME_RATE_CRITICAL] до [CLIENT_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="client_frame_time_normal_msg">
-		Нормально
-	</floater.string>
-	<floater.string name="client_draw_distance_cause_msg">
-		Возможная причина: дальность отрисовки слишком велика
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		Возможная причина: загрузка изображений
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		Возможная причина: слишком много изображений в памяти
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		Возможная причина: слишком много сложных объектов в сцене
-	</floater.string>
-	<floater.string name="network_text_msg">
-		Сеть
-	</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">
-		Сеть теряет более [NETWORK_PACKET_LOSS_CRITICAL]% пакетов
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		Сеть теряет [NETWORK_PACKET_LOSS_WARNING]–[NETWORK_PACKET_LOSS_CRITICAL]% пакетов
-	</floater.string>
-	<floater.string name="network_performance_normal_msg">
-		Нормально
-	</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">
-		Пинг соединения более [NETWORK_PING_CRITICAL] мс
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		Пинг соединения [NETWORK_PING_WARNING]–[NETWORK_PING_CRITICAL] мс
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		Возможно, плохое соединение, или параметр «Ширина канала» слишком велик.
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		Возможно, плохое соединение или есть работающие файлообменные программы.
-	</floater.string>
-	<floater.string name="server_text_msg">
-		Сервер
-	</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">
-		Частота кадров сервера ниже [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		Частота кадров сервера [SERVER_FRAME_RATE_CRITICAL]–[SERVER_FRAME_RATE_WARNING]
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		Нормально
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		Возможная причина: слишком много физических объектов
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		Возможная причина: слишком много скриптовых объектов
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		Возможная причина: слишком большой сетевой трафик
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		Возможная причина: слишком много людей в регионе
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		Возможная причина: слишком много изображений
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		Возможная причина: сервер сильно загружен
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button name="client_lagmeter" tool_tip="Уровень лагов клиента"/>
-	<text name="client">
-		Клиент
-	</text>
-	<text name="client_text">
-		Нормально
-	</text>
-	<button name="network_lagmeter" tool_tip="Уровень лагов сети"/>
-	<text name="network">
-		Сеть
-	</text>
-	<text name="network_text">
-		Нормально
-	</text>
-	<button name="server_lagmeter" tool_tip="Уровень лагов сервера"/>
-	<text name="server">
-		Сервер
-	</text>
-	<text name="server_text">
-		Нормально
-	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="Переключение размера"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_lagmeter.xml b/indra/newview/skins/default/xui/tr/floater_lagmeter.xml
deleted file mode 100644
index 736c50be90..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_lagmeter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="GECİKME ÖLÇER">
-	<floater.string name="max_title_msg">
-		Gecikme Ölçer
-	</floater.string>
-	<floater.string name="max_width_px">
-		360
-	</floater.string>
-	<floater.string name="min_title_msg">
-		Gecikme
-	</floater.string>
-	<floater.string name="min_width_px">
-		90
-	</floater.string>
-	<floater.string name="client_text_msg">
-		İstemci
-	</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, pencere alt zeminde
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		İstemci kare hızı [CLIENT_FRAME_RATE_CRITICAL] altında
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		İstemci kare hızı [CLIENT_FRAME_RATE_CRITICAL] ile [CLIENT_FRAME_RATE_WARNING] arasınad
-	</floater.string>
-	<floater.string name="client_frame_time_normal_msg">
-		Normal
-	</floater.string>
-	<floater.string name="client_draw_distance_cause_msg">
-		Muhtemel neden: Çizme mesafesi çok yüksek
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		Muhtemel neden: Görüntüler yükleniyor
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		Muhtemel neden: Bellekte çok fazla görüntü
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		Muhtemel neden: Sahnede çok fazla karmaşık nesne
-	</floater.string>
-	<floater.string name="network_text_msg">
-		Ağ
-	</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">
-		Bağlantı paketlerin % [NETWORK_PACKET_LOSS_CRITICAL]&apos;sinden fazlasını bırakıyor
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		Bağlantı paketlerin % [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]&apos;sini bırakıyor
-	</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">
-		Bağlantı ping süresi [NETWORK_PING_CRITICAL] ms.den fazla
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		Bağlantı ping süresi [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		Muhtemel yetersiz bağlantı veya &apos;Bant Genişliği&apos; tercihi çok yüksek.
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		Muhtemel yetersiz bağlantı veya dosya paylaşım uygulaması.
-	</floater.string>
-	<floater.string name="server_text_msg">
-		Sunucu
-	</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">
-		Simülatör kare hızı [SERVER_FRAME_RATE_CRITICAL] altında
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		Simülatör kare hızı [SERVER_FRAME_RATE_CRITICAL] ve [SERVER_FRAME_RATE_WARNING] arasında
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		Normal
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		Muhtemel Neden: Çok fazla fiziki nesne
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		Muhtemel Neden: Çok fazla komut dosyalı nesne
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		Muhtemel Neden: Çok fazla ağ trafiği
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		Muhtemel Neden: Bölgede hareket eden çok fazla insan var
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		Muhtemel Neden: Çok fazla görüntü hesabı
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		Muhtemel Neden: Simülatör yükü çok ağır
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button name="client_lagmeter" tool_tip="İstemci gecikme durumu"/>
-	<text name="client">
-		İstemci
-	</text>
-	<text name="client_text">
-		Normal
-	</text>
-	<button name="network_lagmeter" tool_tip="Ağ gecikme durumu"/>
-	<text name="network">
-		Ağ
-	</text>
-	<text name="network_text">
-		Normal
-	</text>
-	<button name="server_lagmeter" tool_tip="Sunucu gecikme durumu"/>
-	<text name="server">
-		Sunucu
-	</text>
-	<text name="server_text">
-		Normal
-	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="Gezdirici büyüklüğünü değiştir"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
deleted file mode 100644
index 6e58e7332f..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="LAG 測量器">
-	<floater.string name="max_title_msg">
-		Lag 測量器
-	</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">
-		客戶端
-	</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">
-		正常
-	</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">
-		網路
-	</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">
-		正常
-	</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">
-		伺服器
-	</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">
-		模擬器 framerate 低於 [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		模擬器 framerate 介於 [SERVER_FRAME_RATE_CRITICAL] 與 [SERVER_FRAME_RATE_WARNING]　之間
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		正常
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		可能原因：太多物理物件
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		可能原因：太多腳本物件
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		可能原因：太多網路流量
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		可能原因：地區有太多移動的人
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		可能原因：太多圖像計算
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		可能原因：模擬器負載過重
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button name="client_lagmeter" tool_tip="客戶端 lag 狀態"/>
-	<text name="client">
-		客戶端
-	</text>
-	<text name="client_text">
-		正常
-	</text>
-	<button name="network_lagmeter" tool_tip="網路 lag 狀態"/>
-	<text name="network">
-		網路
-	</text>
-	<text name="network_text">
-		正常
-	</text>
-	<button name="server_lagmeter" tool_tip="伺服器 lag 狀態"/>
-	<text name="server">
-		伺服器
-	</text>
-	<text name="server_text">
-		正常
-	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="切換浮動視窗尺寸"/>
-</floater>
-- 
cgit v1.2.3


From 3254f9fb5f44426494208927c464d2f1447f812a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 6 Sep 2012 11:52:11 -0700
Subject: removed unused file

---
 .../skins/default/xui/zh/floater_lagmeter.xml      | 151 ---------------------
 1 file changed, 151 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_lagmeter.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
deleted file mode 100644
index e9a082288a..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="LAG 測量器">
-	<floater.string name="max_title_msg">
-		Lag 測量器
-	</floater.string>
-	<floater.string name="max_width_px">
-		360
-	</floater.string>
-	<floater.string name="min_title_msg">
-		延遲
-	</floater.string>
-	<floater.string name="min_width_px">
-		90
-	</floater.string>
-	<floater.string name="client_text_msg">
-		客戶端
-	</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">
-		正常，視窗位於背景
-	</floater.string>
-	<floater.string name="client_frame_time_critical_msg">
-		客戶端幀率低於 [CLIENT_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="client_frame_time_warning_msg">
-		客戶端幀率介於 [CLIENT_FRAME_RATE_CRITICAL] 和 [CLIENT_FRAME_RATE_WARNING] 之間
-	</floater.string>
-	<floater.string name="client_frame_time_normal_msg">
-		正常
-	</floater.string>
-	<floater.string name="client_draw_distance_cause_msg">
-		可能原因：可視距離設得太遠
-	</floater.string>
-	<floater.string name="client_texture_loading_cause_msg">
-		可能原因：正在載入圖像
-	</floater.string>
-	<floater.string name="client_texture_memory_cause_msg">
-		可能原因：記憶體裡圖像太多
-	</floater.string>
-	<floater.string name="client_complex_objects_cause_msg">
-		可能原因：場景內複雜物件太多
-	</floater.string>
-	<floater.string name="network_text_msg">
-		網路
-	</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">
-		這次連通丟失了至少 [NETWORK_PACKET_LOSS_CRITICAL]% 的封包
-	</floater.string>
-	<floater.string name="network_packet_loss_warning_msg">
-		這次連通丟失了 [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% 的封包
-	</floater.string>
-	<floater.string name="network_performance_normal_msg">
-		正常
-	</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">
-		探測連通回應時間超過 [NETWORK_PING_CRITICAL] 毫秒
-	</floater.string>
-	<floater.string name="network_ping_warning_msg">
-		探測連通回應時間為 [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] 毫秒
-	</floater.string>
-	<floater.string name="network_packet_loss_cause_msg">
-		可能連通不良，或所設的偏好連通頻寬過高。
-	</floater.string>
-	<floater.string name="network_ping_cause_msg">
-		可能連通不良，或使用檔案分享應用程式。
-	</floater.string>
-	<floater.string name="server_text_msg">
-		伺服器
-	</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">
-		模擬器 framerate 低於 [SERVER_FRAME_RATE_CRITICAL]
-	</floater.string>
-	<floater.string name="server_frame_time_warning_msg">
-		模擬器 framerate 介於 [SERVER_FRAME_RATE_CRITICAL] 與 [SERVER_FRAME_RATE_WARNING]　之間
-	</floater.string>
-	<floater.string name="server_frame_time_normal_msg">
-		正常
-	</floater.string>
-	<floater.string name="server_physics_cause_msg">
-		可能原因：太多物理物件
-	</floater.string>
-	<floater.string name="server_scripts_cause_msg">
-		可能原因：太多腳本物件
-	</floater.string>
-	<floater.string name="server_net_cause_msg">
-		可能原因：太多網路流量
-	</floater.string>
-	<floater.string name="server_agent_cause_msg">
-		可能原因：地區有太多移動的人
-	</floater.string>
-	<floater.string name="server_images_cause_msg">
-		可能原因：太多圖像計算
-	</floater.string>
-	<floater.string name="server_generic_cause_msg">
-		可能原因：模擬器負載過重
-	</floater.string>
-	<floater.string name="smaller_label">
-		&gt;&gt;
-	</floater.string>
-	<floater.string name="bigger_label">
-		&lt;&lt;
-	</floater.string>
-	<button name="client_lagmeter" tool_tip="客戶端 lag 狀態"/>
-	<text name="client">
-		客戶端
-	</text>
-	<text name="client_text">
-		正常
-	</text>
-	<button name="network_lagmeter" tool_tip="網路 lag 狀態"/>
-	<text name="network">
-		網路
-	</text>
-	<text name="network_text">
-		正常
-	</text>
-	<button name="server_lagmeter" tool_tip="伺服器 lag 狀態"/>
-	<text name="server">
-		伺服器
-	</text>
-	<text name="server_text">
-		正常
-	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="切換浮動視窗尺寸"/>
-</floater>
-- 
cgit v1.2.3


From 74fe126590fba03752d1d8d88dd3bb59c6900026 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 1 Nov 2012 17:52:11 -0700
Subject: SH-3405 FIX convert existing stats to lltrace system output of
 floater_stats is now identical to pre-lltrace system (with some tweaks)

---
 indra/newview/skins/default/xui/en/floater_stats.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index f9eb16d224..273954ee3e 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -104,6 +104,7 @@
 				 label="KTris Drawn per Frame"
 				 unit_label="/fr"
 				 stat="trianglesdrawnstat"
+         unit_scale="0.001"
 				 bar_min="0"
 				 bar_max="10000"
 				 tick_spacing="1000"
@@ -116,6 +117,7 @@
 				 name="ktrissec"
 				 label="KTris Drawn per Sec"
 				 unit_label="/sec"
+         unit_scale="0.001"
 				 stat="trianglesdrawnstat"
 				 bar_min="0"
 				 bar_max="200000"
@@ -222,6 +224,8 @@
 				 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"
@@ -235,11 +239,13 @@
 				 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"
+				 precision="3"
 				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
@@ -247,12 +253,14 @@
 			  <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"
+				 precision="3"
 				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
@@ -261,11 +269,13 @@
 				 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"
+				 precision="3"
 				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
-- 
cgit v1.2.3


From c180fe2ae2b5d2e00149f9902717e02ed7042143 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Mon, 19 Nov 2012 22:28:12 -0700
Subject: for SH-3561: capture the frame buffer contents and compare pixel
 differences between frames.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index c6d9f9ef8f..7923cc9f62 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1981,6 +1981,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"
-- 
cgit v1.2.3


From 7b4d27ecbcb5ac702459be97cbf6b81354850658 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 14 Mar 2013 19:36:50 -0700
Subject: SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
 collapsed Orientation enums to all use LLView::EOrientation added ability to
 display stat bar horizontally

---
 indra/newview/skins/default/xui/en/floater_stats.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 273954ee3e..93d9945800 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -35,6 +35,7 @@
 			 setting="OpenDebugStatBasic">
 			<stat_bar
 			   name="fps"
+         orientation="horizontal"
 			   label="FPS"
 			   unit_label="fps"
 			   stat="fpsstat"
-- 
cgit v1.2.3


From 8de397b19ec9e2f6206fd5ae57dba96c70e78b74 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 18 Mar 2013 08:43:03 -0700
Subject: SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
 changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator
 lookup improvements to stats display of llstatbar added scene load stats
 floater accessed with ctrl|shift|2

---
 .../default/xui/en/floater_scene_load_stats.xml    | 549 +++++++++++++++++++++
 .../newview/skins/default/xui/en/floater_stats.xml |  49 --
 indra/newview/skins/default/xui/en/menu_viewer.xml |   8 +
 3 files changed, 557 insertions(+), 49 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_scene_load_stats.xml

(limited to 'indra/newview/skins/default')

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..fd3cb37f8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -0,0 +1,549 @@
+<?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">
+    <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="bandwidth"
+			   label="Bandwidth"
+			   unit_label="kbps"
+         orientation="horizontal"
+			   stat="kbitstat"
+			   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_max="5"
+			   tick_spacing="0.5"
+			   label_spacing="1"
+			   precision="3"
+			   show_bar="false"
+			   show_mean="true">
+			</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="objs"
+				 label="Total Objects"
+				 unit_label=""
+				 stat="numobjectsstat"
+				 bar_max="50000"
+				 tick_spacing="5000"
+				 label_spacing="10000"
+				 precision="0"
+				 show_bar="false">
+			  </stat_bar>
+			  <stat_bar
+				 name="newobjs"
+				 label="New Objects"
+				 unit_label="/sec"
+				 stat="numnewobjectsstat"
+				 bar_max="2000"
+				 tick_spacing="200"
+				 label_spacing="400"
+				 show_bar="false">
+			  </stat_bar>
+       <stat_bar
+				 name="object_cache_hits"
+				 label="Object Cache Hit Rate"
+				 stat="object_cache_hits"
+				 bar_max="100"
+         unit_label="%"
+				 tick_spacing="20"
+				 label_spacing="20"
+				 show_history="true"
+				 show_bar="false">
+        </stat_bar>
+			</stat_view>
+        <!--Texture Stats-->
+			<stat_view
+			   name="texture"
+			   label="Texture"
+			   show_label="true">
+			  <stat_bar
+				 name="texture_cache_hits"
+				 label="Cache Hit Rate"
+				 stat="texture_cache_hits"
+				 bar_max="100.f"
+         unit_label="%"
+				 tick_spacing="20"
+				 label_spacing="20"
+				 show_history="true"
+				 show_bar="false">
+        </stat_bar>
+        <stat_bar
+				 name="texture_cache_read_latency"
+				 label="Cache Read Latency"
+         unit_label="msec"
+				 stat="texture_cache_read_latency"
+				 bar_max="1000.f"
+				 tick_spacing="100"
+				 label_spacing="200"
+				 show_history="true"
+				 show_bar="false">
+        </stat_bar>
+        <stat_bar
+				 name="numimagesstat"
+				 label="Count"
+				 stat="numimagesstat" 
+				 bar_max="8000.f" 
+				 tick_spacing="2000.f"
+				 label_spacing="4000.f" 
+				 show_bar="false">
+			  </stat_bar>
+
+			  <stat_bar
+				 name="numrawimagesstat"
+				 label="Raw Count"
+				 stat="numrawimagesstat"
+				 bar_max="8000.f" 
+				 tick_spacing="2000.f"
+				 label_spacing="4000.f" 
+				 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_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_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_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_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_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_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_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_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_bar="false" >
+			  </stat_bar>
+			</stat_view>
+		  </stat_view>
+        <!--Sim Stats-->
+		  <stat_view
+			 name="sim"
+			 label="Simulator"
+			 show_label="true"
+			 setting="OpenDebugStatSim">
+	
+			<stat_bar
+			   name="simobjects"
+			   label="Objects"
+			   stat="simobjects"
+			   precision="0"
+			   bar_max="30000.f" 
+			   tick_spacing="5000.f"
+			   label_spacing="10000.f" 
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simactiveobjects"
+			   label="Active Objects"
+			   stat="simactiveobjects"
+			   precision="0"
+			   bar_max="5000.f" 
+			   tick_spacing="750.f"
+			   label_spacing="1250.f" 
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simactivescripts"
+			   label="Active Scripts"
+			   stat="simactivescripts"
+			   precision="0"
+			   bar_max="15000.f" 
+			   tick_spacing="1875.f"
+			   label_spacing="3750.f"  
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+        
+
+			<stat_bar
+			   name="siminpps"
+			   label="Packets In"
+			   stat="siminpps"
+			   unit_label="pps"
+			   precision="0"
+			   bar_max="2000.f" 
+			   tick_spacing="250.f"
+			   label_spacing="1000.f" 
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simoutpps"
+			   label="Packets Out"
+			   stat="simoutpps"
+			   unit_label="pps" 
+			   precision="0"
+			   bar_max="2000.f" 
+			   tick_spacing="250.f"
+			   label_spacing="1000.f" 
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simpendingdownloads"
+			   label="Pending Downloads"
+			   stat="simpendingdownloads"
+			   precision="0"
+			   bar_max="800.f" 
+			   tick_spacing="100.f"
+			   label_spacing="200.f" 
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simpendinguploads"
+			   label="Pending Uploads"
+			   stat="simpendinguploads"
+			   precision="0"
+			   bar_max="100.f" 
+			   tick_spacing="25.f"
+			   label_spacing="50.f" 
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
+
+			<stat_bar
+			   name="simtotalunackedbytes"
+			   label="Total Unacked Bytes"
+			   stat="simtotalunackedbytes"
+			   unit_label="kb"
+			   precision="1"
+			   bar_max="100000.f" 
+			   tick_spacing="25000.f"
+			   label_spacing="50000.f" 
+			   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_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simnetmsec"
+				 label="Net Time"
+				 stat="simnetmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simsimphysicsmsec"
+				 label="Physics Time"
+				 stat="simsimphysicsmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simsimothermsec"
+				 label="Simulation Time"
+				 stat="simsimothermsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simagentmsec"
+				 label="Agent Time"
+				 stat="simagentmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simimagesmsec"
+				 label="Images Time"
+				 stat="simimagesmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+			  <stat_bar
+				 name="simscriptmsec"
+				 label="Script Time"
+				 stat="simscriptmsec"
+				 unit_label="ms"
+				 precision="3"
+				 bar_max="40.f" 
+				 tick_spacing="10.f"
+				 label_spacing="20.f" 
+				 show_bar="false"
+				 show_mean="false" >
+			  </stat_bar>
+
+        <stat_bar
+         name="simsparemsec"
+         label="Spare Time"
+         stat="simsparemsec"
+         unit_label="ms"
+         precision="3"
+         bar_max="40.f"
+         tick_spacing="10.f"
+         label_spacing="20.f"
+         show_bar="false"
+         show_mean="false" >
+        </stat_bar>
+        <!--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"
+             stat="simsimphysicsstepmsec"
+             unit_label="ms"
+             precision="3"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_bar="false"
+             show_mean="false" >
+            </stat_bar>
+            <stat_bar
+             name="simsimphysicsshapeupdatemsec"
+             label="  Update Phys Shapes"
+             stat="simsimphysicsshapeupdatemsec"
+             unit_label="ms"
+             precision="3"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_bar="false"
+             show_mean="false" >
+            </stat_bar>
+            <stat_bar
+             name="simsimphysicsothermsec"
+             label="  Physics Other"
+             stat="simsimphysicsothermsec"
+             unit_label="ms"
+             precision="3"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_bar="false"
+             show_mean="false" >
+            </stat_bar>
+            <stat_bar
+             name="simsleepmsec"
+             label="  Sleep Time"
+             stat="simsleepmsec"
+             unit_label="ms"
+             precision="3"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_bar="false"
+             show_mean="false" >
+            </stat_bar>
+            <stat_bar
+             name="simpumpiomsec"
+             label="  Pump IO"
+             stat="simpumpiomsec"
+             unit_label="ms"
+             precision="3"
+             bar_max="40.f"
+             tick_spacing="10.f"
+             label_spacing="20.f"
+             show_bar="false"
+             show_mean="false" >
+            </stat_bar>
+			</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 93d9945800..a3f2fb0b9c 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -70,7 +70,6 @@
 			   tick_spacing="0.5"
 			   label_spacing="1"
 			   precision="3"
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="true">
 			</stat_bar>
@@ -85,7 +84,6 @@
 			   label_spacing="1000"
 				 precision="0"
 			   show_bar="false"
-			   show_per_sec="false"
 			   show_mean="false">
 			</stat_bar>
 		  </stat_view>
@@ -137,7 +135,6 @@
 				 tick_spacing="5000"
 				 label_spacing="10000"
 				 precision="0"
-				 show_per_sec="false"
 				 show_bar="false">
 			  </stat_bar>
 			  <stat_bar
@@ -149,7 +146,6 @@
 				 bar_max="2000"
 				 tick_spacing="200"
 				 label_spacing="400"
-				 show_per_sec="true"
 				 show_bar="false">
 			  </stat_bar>
        <stat_bar
@@ -162,7 +158,6 @@
 				 tick_spacing="20"
 				 label_spacing="20"
 				 show_history="true"
-         show_per_sec="false"
 				 show_bar="false">
         </stat_bar>
 			</stat_view>
@@ -181,7 +176,6 @@
 				 tick_spacing="20"
 				 label_spacing="20"
 				 show_history="true"
-         show_per_sec="false"
 				 show_bar="false">
         </stat_bar>
         <stat_bar
@@ -194,7 +188,6 @@
 				 tick_spacing="100"
 				 label_spacing="200"
 				 show_history="true"
-         show_per_sec="false"
 				 show_bar="false">
         </stat_bar>
         <stat_bar
@@ -205,7 +198,6 @@
 				 bar_max="8000.f" 
 				 tick_spacing="2000.f"
 				 label_spacing="4000.f" 
-				 show_per_sec="false"
 				 show_bar="false">
 			  </stat_bar>
 
@@ -217,7 +209,6 @@
 				 bar_max="8000.f" 
 				 tick_spacing="2000.f"
 				 label_spacing="4000.f" 
-				 show_per_sec="false"
 				 show_bar="false">
 			  </stat_bar>
 
@@ -232,7 +223,6 @@
 				 tick_spacing="100.f"
 				 label_spacing="200.f" 
 				 precision="1"
-				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
 
@@ -247,7 +237,6 @@
 				 tick_spacing="100.f"
 				 label_spacing="200.f" 
 				 precision="3"
-				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
 
@@ -262,7 +251,6 @@
 				 tick_spacing="100.f"
 				 label_spacing="200.f" 
 				 precision="3"
-				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
 
@@ -277,7 +265,6 @@
 				 tick_spacing="100.f"
 				 label_spacing="200.f" 
 				 precision="3"
-				 show_per_sec="false" 
          show_bar="false">
         </stat_bar>
 			</stat_view>
@@ -398,7 +385,6 @@
 				 label="VFS Pending Operations"
 				 stat="vfspendingoperations"
 				 unit_label=" Ops."
-				 show_per_sec="false"
 				 show_bar="false" >
 			  </stat_bar>
 			</stat_view>
@@ -418,7 +404,6 @@
 			   bar_max="1.f" 
 			   tick_spacing="0.16666f"
 			   label_spacing="0.33333f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -432,7 +417,6 @@
 			   bar_max="45.f" 
 			   tick_spacing="7.5f"
 			   label_spacing="15.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -446,7 +430,6 @@
 			   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>
@@ -464,7 +447,6 @@
 				 bar_max="500.f" 
 				 tick_spacing="50.f"
 				 label_spacing="100.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -478,7 +460,6 @@
 				 bar_max="500.f" 
 				 tick_spacing="50.f"
 				 label_spacing="100.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -493,7 +474,6 @@
 				 bar_max="1024.f" 
 				 tick_spacing="128.f"
 				 label_spacing="256.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -508,7 +488,6 @@
 			   bar_max="100.f" 
 			   tick_spacing="25.f"
 			   label_spacing="50.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -522,7 +501,6 @@
 			   bar_max="80.f" 
 			   tick_spacing="10.f"
 			   label_spacing="40.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -536,7 +514,6 @@
 			   bar_max="40.f" 
 			   tick_spacing="5.f"
 			   label_spacing="10.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -550,7 +527,6 @@
 			   bar_max="30000.f" 
 			   tick_spacing="5000.f"
 			   label_spacing="10000.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -564,7 +540,6 @@
 			   bar_max="5000.f" 
 			   tick_spacing="750.f"
 			   label_spacing="1250.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -578,7 +553,6 @@
 			   bar_max="15000.f" 
 			   tick_spacing="1875.f"
 			   label_spacing="3750.f"  
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -592,7 +566,6 @@
             tick_spacing="10"
             label_spacing="20"
             precision="3"
-            show_per_sec="false"
             show_bar="false"
             show_mean="true">
         </stat_bar>
@@ -607,7 +580,6 @@
 			   bar_max="5000.f" 
 			   tick_spacing="750.f"
 			   label_spacing="1250.f"  
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -626,7 +598,6 @@
               bar_max="40.f"
               tick_spacing="10.f"
               label_spacing="20.f"
-              show_per_sec="false"
               show_bar="false"
               show_mean="false" >
           </stat_bar>
@@ -640,7 +611,6 @@
               bar_max="45"
               tick_spacing="4"
               label_spacing="8"
-              show_per_sec="false"
               show_bar="false">
           </stat_bar>
           <stat_bar
@@ -653,7 +623,6 @@
               tick_spacing="10"
               label_spacing="20"
               precision="1"
-              show_per_sec="false"
               show_bar="false"
               show_mean="true">
           </stat_bar>
@@ -669,7 +638,6 @@
 			   bar_max="2000.f" 
 			   tick_spacing="250.f"
 			   label_spacing="1000.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -684,7 +652,6 @@
 			   bar_max="2000.f" 
 			   tick_spacing="250.f"
 			   label_spacing="1000.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -698,7 +665,6 @@
 			   bar_max="800.f" 
 			   tick_spacing="100.f"
 			   label_spacing="200.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -712,7 +678,6 @@
 			   bar_max="100.f" 
 			   tick_spacing="25.f"
 			   label_spacing="50.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -727,7 +692,6 @@
 			   bar_max="100000.f" 
 			   tick_spacing="25000.f"
 			   label_spacing="50000.f" 
-			   show_per_sec="false"
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -746,7 +710,6 @@
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
 				 label_spacing="20.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -761,7 +724,6 @@
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
 				 label_spacing="20.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -776,7 +738,6 @@
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
 				 label_spacing="20.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -791,7 +752,6 @@
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
 				 label_spacing="20.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -806,7 +766,6 @@
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
 				 label_spacing="20.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -821,7 +780,6 @@
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
 				 label_spacing="20.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -836,7 +794,6 @@
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
 				 label_spacing="20.f" 
-				 show_per_sec="false"
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -851,7 +808,6 @@
          bar_max="40.f"
          tick_spacing="10.f"
          label_spacing="20.f"
-         show_per_sec="false"
          show_bar="false"
          show_mean="false" >
         </stat_bar>
@@ -870,7 +826,6 @@
              bar_max="40.f"
              tick_spacing="10.f"
              label_spacing="20.f"
-             show_per_sec="false"
              show_bar="false"
              show_mean="false" >
             </stat_bar>
@@ -884,7 +839,6 @@
              bar_max="40.f"
              tick_spacing="10.f"
              label_spacing="20.f"
-             show_per_sec="false"
              show_bar="false"
              show_mean="false" >
             </stat_bar>
@@ -898,7 +852,6 @@
              bar_max="40.f"
              tick_spacing="10.f"
              label_spacing="20.f"
-             show_per_sec="false"
              show_bar="false"
              show_mean="false" >
             </stat_bar>
@@ -912,7 +865,6 @@
              bar_max="40.f"
              tick_spacing="10.f"
              label_spacing="20.f"
-             show_per_sec="false"
              show_bar="false"
              show_mean="false" >
             </stat_bar>
@@ -926,7 +878,6 @@
              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 8fe955aed8..5b6a6f908a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1384,6 +1384,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">
-- 
cgit v1.2.3


From df6dfc4d1d3f9efc0035b3596dfbd9ea251328b6 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 18 Mar 2013 16:19:21 -0700
Subject: SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
 cleaned up xml file

---
 .../default/xui/en/floater_scene_load_stats.xml    | 979 +++++++++------------
 1 file changed, 435 insertions(+), 544 deletions(-)

(limited to 'indra/newview/skins/default')

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 fd3cb37f8f..9dbf59ef4d 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
@@ -1,549 +1,440 @@
 <?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">
-    <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="bandwidth"
-			   label="Bandwidth"
-			   unit_label="kbps"
-         orientation="horizontal"
-			   stat="kbitstat"
-			   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_max="5"
-			   tick_spacing="0.5"
-			   label_spacing="1"
-			   precision="3"
-			   show_bar="false"
-			   show_mean="true">
-			</stat_bar>
+<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 top="20"
+            bottom="60"
+            left="10"
+            width="100"
+            label="Pause"
+            name="playpause"/>
+    <scroll_container follows="top|left|bottom|right"
+                      height="380"
+                      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="bandwidth"
+                  label="Bandwidth"
+                  unit_label="kbps"
+                  orientation="horizontal"
+                  stat="kbitstat"
+                  bar_max="5000"
+                  tick_spacing="500"
+                  label_spacing="1000"
+                  precision="0"
+                  show_bar="true"
+                  show_history="false"/>
+			  <stat_bar name="packet_loss"
+                  label="Packet Loss"
+                  unit_label=" %"
+                  stat="packetslostpercentstat"
+                  bar_max="5"
+                  tick_spacing="0.5"
+                  label_spacing="1"
+                  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"
-				 unit_label=""
-				 stat="numobjectsstat"
-				 bar_max="50000"
-				 tick_spacing="5000"
-				 label_spacing="10000"
-				 precision="0"
-				 show_bar="false">
-			  </stat_bar>
-			  <stat_bar
-				 name="newobjs"
-				 label="New Objects"
-				 unit_label="/sec"
-				 stat="numnewobjectsstat"
-				 bar_max="2000"
-				 tick_spacing="200"
-				 label_spacing="400"
-				 show_bar="false">
-			  </stat_bar>
-       <stat_bar
-				 name="object_cache_hits"
-				 label="Object Cache Hit Rate"
-				 stat="object_cache_hits"
-				 bar_max="100"
-         unit_label="%"
-				 tick_spacing="20"
-				 label_spacing="20"
-				 show_history="true"
-				 show_bar="false">
-        </stat_bar>
-			</stat_view>
-        <!--Texture Stats-->
-			<stat_view
-			   name="texture"
-			   label="Texture"
-			   show_label="true">
-			  <stat_bar
-				 name="texture_cache_hits"
-				 label="Cache Hit Rate"
-				 stat="texture_cache_hits"
-				 bar_max="100.f"
-         unit_label="%"
-				 tick_spacing="20"
-				 label_spacing="20"
-				 show_history="true"
-				 show_bar="false">
-        </stat_bar>
-        <stat_bar
-				 name="texture_cache_read_latency"
-				 label="Cache Read Latency"
-         unit_label="msec"
-				 stat="texture_cache_read_latency"
-				 bar_max="1000.f"
-				 tick_spacing="100"
-				 label_spacing="200"
-				 show_history="true"
-				 show_bar="false">
-        </stat_bar>
-        <stat_bar
-				 name="numimagesstat"
-				 label="Count"
-				 stat="numimagesstat" 
-				 bar_max="8000.f" 
-				 tick_spacing="2000.f"
-				 label_spacing="4000.f" 
-				 show_bar="false">
-			  </stat_bar>
-
-			  <stat_bar
-				 name="numrawimagesstat"
-				 label="Raw Count"
-				 stat="numrawimagesstat"
-				 bar_max="8000.f" 
-				 tick_spacing="2000.f"
-				 label_spacing="4000.f" 
-				 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_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_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_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_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_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_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_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_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_bar="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="objs"
+                    label="Total Objects"
+                    unit_label=""
+                    stat="numobjectsstat"
+                    bar_max="50000"
+                    tick_spacing="5000"
+                    label_spacing="10000"
+                    precision="0"
+                    show_bar="false"/>
+			    <stat_bar name="newobjs"
+                    label="New Objects"
+                    unit_label="/sec"
+                    stat="numnewobjectsstat"
+                    bar_max="2000"
+                    tick_spacing="200"
+                    label_spacing="400"
+                    show_bar="false"/>
+         <stat_bar name="object_cache_hits"
+                   label="Object Cache Hit Rate"
+                   stat="object_cache_hits"
+                   bar_max="100"
+                   unit_label="%"
+                   tick_spacing="20"
+                   label_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"
+                    stat="texture_cache_hits"
+                    bar_max="100.f"
+                    unit_label="%"
+                    tick_spacing="20"
+                    label_spacing="20"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="texture_cache_read_latency"
+                    label="Cache Read Latency"
+                    unit_label="msec"
+                    stat="texture_cache_read_latency"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    label_spacing="200"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="numimagesstat"
+                    label="Count"
+                    stat="numimagesstat" 
+                    bar_max="8000.f" 
+                    tick_spacing="2000.f"
+                    label_spacing="4000.f" 
+                    show_bar="false"/>
+			    <stat_bar name="numrawimagesstat"
+                    label="Raw Count"
+                    stat="numrawimagesstat"
+                    bar_max="8000.f" 
+                    tick_spacing="2000.f"
+                    label_spacing="4000.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"
+                    stat="packetsinstat"
+                    unit_label="/sec" 
+                    bar_max="1024.f" 
+                    tick_spacing="128.f"
+                    label_spacing="256.f" 
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="packetsoutstat"
+                    label="Packets Out"
+                    stat="packetsoutstat"
+                    unit_label="/sec"  
+                    bar_max="1024.f" 
+                    tick_spacing="128.f"
+                    label_spacing="256.f" 
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="objectkbitstat"
+                    label="Objects"
+                    stat="objectkbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    label_spacing="256.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="texturekbitstat"
+                    label="Texture"
+                    stat="texturekbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    label_spacing="256.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="assetkbitstat"
+                    label="Asset"
+                    stat="assetkbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    label_spacing="256.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="layerskbitstat"
+                    label="Layers"
+                    stat="layerskbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    label_spacing="256.f"
+                    precision="1"
+                    show_bar="false"/>
+			    <stat_bar name="actualinkbitstat"
+                    label="Actual In"
+                    stat="actualinkbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    label_spacing="256.f"
+                    precision="1"
+                    show_bar="false"
+                    show_history="false"/>
+			    <stat_bar name="actualoutkbitstat"
+                    label="Actual Out"
+                    stat="actualoutkbitstat"
+                    unit_label="kbps"
+                    bar_max="1024.f"
+                    tick_spacing="128.f"
+                    label_spacing="256.f"
+                    precision="1"
+                    show_bar="false"
+                    show_history="false"/>
+			    <stat_bar name="vfspendingoperations"
+                    label="VFS Pending Operations"
+                    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"
-			   stat="simobjects"
-			   precision="0"
-			   bar_max="30000.f" 
-			   tick_spacing="5000.f"
-			   label_spacing="10000.f" 
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simactiveobjects"
-			   label="Active Objects"
-			   stat="simactiveobjects"
-			   precision="0"
-			   bar_max="5000.f" 
-			   tick_spacing="750.f"
-			   label_spacing="1250.f" 
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simactivescripts"
-			   label="Active Scripts"
-			   stat="simactivescripts"
-			   precision="0"
-			   bar_max="15000.f" 
-			   tick_spacing="1875.f"
-			   label_spacing="3750.f"  
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-        
-
-			<stat_bar
-			   name="siminpps"
-			   label="Packets In"
-			   stat="siminpps"
-			   unit_label="pps"
-			   precision="0"
-			   bar_max="2000.f" 
-			   tick_spacing="250.f"
-			   label_spacing="1000.f" 
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simoutpps"
-			   label="Packets Out"
-			   stat="simoutpps"
-			   unit_label="pps" 
-			   precision="0"
-			   bar_max="2000.f" 
-			   tick_spacing="250.f"
-			   label_spacing="1000.f" 
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simpendingdownloads"
-			   label="Pending Downloads"
-			   stat="simpendingdownloads"
-			   precision="0"
-			   bar_max="800.f" 
-			   tick_spacing="100.f"
-			   label_spacing="200.f" 
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simpendinguploads"
-			   label="Pending Uploads"
-			   stat="simpendinguploads"
-			   precision="0"
-			   bar_max="100.f" 
-			   tick_spacing="25.f"
-			   label_spacing="50.f" 
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simtotalunackedbytes"
-			   label="Total Unacked Bytes"
-			   stat="simtotalunackedbytes"
-			   unit_label="kb"
-			   precision="1"
-			   bar_max="100000.f" 
-			   tick_spacing="25000.f"
-			   label_spacing="50000.f" 
-			   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_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simnetmsec"
-				 label="Net Time"
-				 stat="simnetmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simsimphysicsmsec"
-				 label="Physics Time"
-				 stat="simsimphysicsmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simsimothermsec"
-				 label="Simulation Time"
-				 stat="simsimothermsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simagentmsec"
-				 label="Agent Time"
-				 stat="simagentmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simimagesmsec"
-				 label="Images Time"
-				 stat="simimagesmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simscriptmsec"
-				 label="Script Time"
-				 stat="simscriptmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-        <stat_bar
-         name="simsparemsec"
-         label="Spare Time"
-         stat="simsparemsec"
-         unit_label="ms"
-         precision="3"
-         bar_max="40.f"
-         tick_spacing="10.f"
-         label_spacing="20.f"
-         show_bar="false"
-         show_mean="false" >
-        </stat_bar>
-        <!--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"
-             stat="simsimphysicsstepmsec"
-             unit_label="ms"
-             precision="3"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_bar="false"
-             show_mean="false" >
-            </stat_bar>
-            <stat_bar
-             name="simsimphysicsshapeupdatemsec"
-             label="  Update Phys Shapes"
-             stat="simsimphysicsshapeupdatemsec"
-             unit_label="ms"
-             precision="3"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_bar="false"
-             show_mean="false" >
-            </stat_bar>
-            <stat_bar
-             name="simsimphysicsothermsec"
-             label="  Physics Other"
-             stat="simsimphysicsothermsec"
-             unit_label="ms"
-             precision="3"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_bar="false"
-             show_mean="false" >
-            </stat_bar>
-            <stat_bar
-             name="simsleepmsec"
-             label="  Sleep Time"
-             stat="simsleepmsec"
-             unit_label="ms"
-             precision="3"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_bar="false"
-             show_mean="false" >
-            </stat_bar>
-            <stat_bar
-             name="simpumpiomsec"
-             label="  Pump IO"
-             stat="simpumpiomsec"
-             unit_label="ms"
-             precision="3"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_bar="false"
-             show_mean="false" >
-            </stat_bar>
-			</stat_view>
-			</stat_view>
+<!--Sim Stats-->
+		  <stat_view name="sim"
+                 label="Simulator"
+                 show_label="true"
+                 setting="OpenDebugStatSim">
+			  <stat_bar name="simobjects"
+                  label="Objects"
+                  stat="simobjects"
+                  precision="0"
+                  bar_max="30000.f" 
+                  tick_spacing="5000.f"
+                  label_spacing="10000.f" 
+                  show_bar="false"
+                  show_mean="false"/>
+			  <stat_bar name="simactiveobjects"
+                  label="Active Objects"
+                  stat="simactiveobjects"
+                  precision="0"
+                  bar_max="5000.f" 
+                  tick_spacing="750.f"
+                  label_spacing="1250.f" 
+                  show_bar="false"
+                  show_mean="false"/>
+			  <stat_bar name="simactivescripts"
+                  label="Active Scripts"
+                  stat="simactivescripts"
+                  precision="0"
+                  bar_max="15000.f" 
+                  tick_spacing="1875.f"
+                  label_spacing="3750.f"  
+                  show_bar="false"
+                  show_mean="false"/>
+			  <stat_bar name="siminpps"
+                  label="Packets In"
+                  stat="siminpps"
+                  unit_label="pps"
+                  precision="0"
+                  bar_max="2000.f" 
+                  tick_spacing="250.f"
+                  label_spacing="1000.f" 
+                  show_bar="false"
+                  show_mean="false"/>
+			  <stat_bar name="simoutpps"
+                  label="Packets Out"
+                  stat="simoutpps"
+                  unit_label="pps" 
+                  precision="0"
+                  bar_max="2000.f" 
+                  tick_spacing="250.f"
+                  label_spacing="1000.f" 
+                  show_bar="false"
+                  show_mean="false"/>
+			  <stat_bar name="simpendingdownloads"
+                  label="Pending Downloads"
+                  stat="simpendingdownloads"
+                  precision="0"
+                  bar_max="800.f" 
+                  tick_spacing="100.f"
+                  label_spacing="200.f" 
+                  show_bar="false"
+                  show_mean="false"/>
+			  <stat_bar name="simpendinguploads"
+                  label="Pending Uploads"
+                  stat="simpendinguploads"
+                  precision="0"
+                  bar_max="100.f" 
+                  tick_spacing="25.f"
+                  label_spacing="50.f" 
+                  show_bar="false"
+                  show_mean="false"/>
+			  <stat_bar name="simtotalunackedbytes"
+                  label="Total Unacked Bytes"
+                  stat="simtotalunackedbytes"
+                  unit_label="kb"
+                  precision="1"
+                  bar_max="100000.f" 
+                  tick_spacing="25000.f"
+                  label_spacing="50000.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"
+                    stat="simframemsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f" 
+                    tick_spacing="10.f"
+                    label_spacing="20.f" 
+                    show_bar="false"
+                    show_mean="false"/>
+			    <stat_bar name="simnetmsec"
+                    label="Net Time"
+                    stat="simnetmsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f" 
+                    tick_spacing="10.f"
+                    label_spacing="20.f" 
+                    show_bar="false"
+                    show_mean="false"/>
+			    <stat_bar name="simsimphysicsmsec"
+                    label="Physics Time"
+                    stat="simsimphysicsmsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f" 
+                    tick_spacing="10.f"
+                    label_spacing="20.f" 
+                    show_bar="false"
+                    show_mean="false"/>
+			    <stat_bar name="simsimothermsec"
+                    label="Simulation Time"
+                    stat="simsimothermsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f" 
+                    tick_spacing="10.f"
+                    label_spacing="20.f" 
+                    show_bar="false"
+                    show_mean="false"/>
+			    <stat_bar name="simagentmsec"
+                    label="Agent Time"
+                    stat="simagentmsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f" 
+                    tick_spacing="10.f"
+                    label_spacing="20.f" 
+                    show_bar="false"
+                    show_mean="false"/>
+			    <stat_bar name="simimagesmsec"
+                    label="Images Time"
+                    stat="simimagesmsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f" 
+                    tick_spacing="10.f"
+                    label_spacing="20.f" 
+                    show_bar="false"
+                    show_mean="false"/>
+			    <stat_bar name="simscriptmsec"
+                    label="Script Time"
+                    stat="simscriptmsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f" 
+                    tick_spacing="10.f"
+                    label_spacing="20.f" 
+                    show_bar="false"
+                    show_mean="false"/>
+          <stat_bar name="simsparemsec"
+                    label="Spare Time"
+                    stat="simsparemsec"
+                    unit_label="ms"
+                    precision="3"
+                    bar_max="40.f"
+                    tick_spacing="10.f"
+                    label_spacing="20.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"
+                      stat="simsimphysicsstepmsec"
+                      unit_label="ms"
+                      precision="3"
+                      bar_max="40.f"
+                      tick_spacing="10.f"
+                      label_spacing="20.f"
+                      show_bar="false"
+                      show_mean="false"/>
+            <stat_bar name="simsimphysicsshapeupdatemsec"
+                      label="  Update Phys Shapes"
+                      stat="simsimphysicsshapeupdatemsec"
+                      unit_label="ms"
+                      precision="3"
+                      bar_max="40.f"
+                      tick_spacing="10.f"
+                      label_spacing="20.f"
+                      show_bar="false"
+                      show_mean="false"/>
+            <stat_bar name="simsimphysicsothermsec"
+                      label="  Physics Other"
+                      stat="simsimphysicsothermsec"
+                      unit_label="ms"
+                      precision="3"
+                      bar_max="40.f"
+                      tick_spacing="10.f"
+                      label_spacing="20.f"
+                      show_bar="false"
+                      show_mean="false"/>
+            <stat_bar name="simsleepmsec"
+                      label="  Sleep Time"
+                      stat="simsleepmsec"
+                      unit_label="ms"
+                      precision="3"
+                      bar_max="40.f"
+                      tick_spacing="10.f"
+                      label_spacing="20.f"
+                      show_bar="false"
+                      show_mean="false"/>
+            <stat_bar name="simpumpiomsec"
+                      label="  Pump IO"
+                      stat="simpumpiomsec"
+                      unit_label="ms"
+                      precision="3"
+                      bar_max="40.f"
+                      tick_spacing="10.f"
+                      label_spacing="20.f"
+                      show_bar="false"
+                      show_mean="false"/>
+          </stat_view>
+			  </stat_view>
 		  </stat_view>
-		</container_view>
-    </scroll_container>
+    </container_view>
+  </scroll_container>
 </floater>
-- 
cgit v1.2.3


From 933691ad133b552be3fdd26b0d9d26a09c3a7aa5 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Wed, 20 Mar 2013 16:29:48 -0600
Subject: for SH-4004: interesting: need debug option to clear viewer cache
 while still logged in

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5b6a6f908a..7e5b5ed1e9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2758,6 +2758,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
-- 
cgit v1.2.3


From 1f507c3cfca0c7722ebeaf71883fbaa83988e1a9 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 21 Mar 2013 00:37:20 -0700
Subject: SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
 copied over scene load frame differencing changes from viewer-interesting
 made periodicrecording flexible enough to allow for indefinite number of
 periods added scene loading stats floater fixed collapsing behavior of
 container views

---
 .../default/xui/en/floater_scene_load_stats.xml    | 84 ++++++++++++++++------
 1 file changed, 64 insertions(+), 20 deletions(-)

(limited to 'indra/newview/skins/default')

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 9dbf59ef4d..f4021d210a 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
@@ -15,7 +15,7 @@
             label="Pause"
             name="playpause"/>
     <scroll_container follows="top|left|bottom|right"
-                      height="380"
+                      bottom="400"
                       layout="topleft"
                       left="0"
                       name="statistics_scroll"
@@ -34,19 +34,28 @@
                  label="Basic"
                  show_label="true"
                  setting="OpenDebugStatBasic">
-			  <stat_bar name="bandwidth"
+        <stat_bar name="frame difference"
+                  label="Frame Pixel Difference"
+                  orientation="horizontal"
+                  unit_label="%"
+                  stat="FramePixelDifference"
+                  bar_max="100"
+                  tick_spacing="10"
+                  label_spacing="20"
+                  unit_scale="100"
+                  precision="0"/>
+        <stat_bar name="bandwidth"
                   label="Bandwidth"
-                  unit_label="kbps"
                   orientation="horizontal"
+                  unit_label="kbps"
                   stat="kbitstat"
                   bar_max="5000"
                   tick_spacing="500"
                   label_spacing="1000"
-                  precision="0"
-                  show_bar="true"
-                  show_history="false"/>
+                  precision="0"/>
 			  <stat_bar name="packet_loss"
                   label="Packet Loss"
+                  orientation="horizontal"
                   unit_label=" %"
                   stat="packetslostpercentstat"
                   bar_max="5"
@@ -67,6 +76,7 @@
                    setting="OpenDebugStatRender">
           <stat_bar name="objs"
                     label="Total Objects"
+                    orientation="horizontal"
                     unit_label=""
                     stat="numobjectsstat"
                     bar_max="50000"
@@ -74,23 +84,25 @@
                     label_spacing="10000"
                     precision="0"
                     show_bar="false"/>
-			    <stat_bar name="newobjs"
+          <stat_bar name="newobjs"
                     label="New Objects"
+                    orientation="horizontal"
                     unit_label="/sec"
                     stat="numnewobjectsstat"
                     bar_max="2000"
                     tick_spacing="200"
                     label_spacing="400"
                     show_bar="false"/>
-         <stat_bar name="object_cache_hits"
-                   label="Object Cache Hit Rate"
-                   stat="object_cache_hits"
-                   bar_max="100"
-                   unit_label="%"
-                   tick_spacing="20"
-                   label_spacing="20"
-                   show_history="true"
-                   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"
+                    label_spacing="20"
+                    show_history="true"
+                    show_bar="false"/>
 			  </stat_view>
 <!--Texture Stats-->
 			  <stat_view name="texture"
@@ -98,6 +110,7 @@
                    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="%"
@@ -107,6 +120,7 @@
                     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"
@@ -116,6 +130,7 @@
                     show_bar="false"/>
           <stat_bar name="numimagesstat"
                     label="Count"
+                    orientation="horizontal"
                     stat="numimagesstat" 
                     bar_max="8000.f" 
                     tick_spacing="2000.f"
@@ -123,6 +138,7 @@
                     show_bar="false"/>
 			    <stat_bar name="numrawimagesstat"
                     label="Raw Count"
+                    orientation="horizontal"
                     stat="numrawimagesstat"
                     bar_max="8000.f" 
                     tick_spacing="2000.f"
@@ -136,6 +152,7 @@
                    setting="OpenDebugStatNet">
 			    <stat_bar name="packetsinstat"
                     label="Packets In"
+                    orientation="horizontal"
                     stat="packetsinstat"
                     unit_label="/sec" 
                     bar_max="1024.f" 
@@ -145,6 +162,7 @@
                     show_bar="false"/>
 			    <stat_bar name="packetsoutstat"
                     label="Packets Out"
+                    orientation="horizontal"
                     stat="packetsoutstat"
                     unit_label="/sec"  
                     bar_max="1024.f" 
@@ -154,6 +172,7 @@
                     show_bar="false"/>
 			    <stat_bar name="objectkbitstat"
                     label="Objects"
+                    orientation="horizontal"
                     stat="objectkbitstat"
                     unit_label="kbps"
                     bar_max="1024.f"
@@ -163,6 +182,7 @@
                     show_bar="false"/>
 			    <stat_bar name="texturekbitstat"
                     label="Texture"
+                    orientation="horizontal"
                     stat="texturekbitstat"
                     unit_label="kbps"
                     bar_max="1024.f"
@@ -172,6 +192,7 @@
                     show_bar="false"/>
 			    <stat_bar name="assetkbitstat"
                     label="Asset"
+                    orientation="horizontal"
                     stat="assetkbitstat"
                     unit_label="kbps"
                     bar_max="1024.f"
@@ -181,6 +202,7 @@
                     show_bar="false"/>
 			    <stat_bar name="layerskbitstat"
                     label="Layers"
+                    orientation="horizontal"
                     stat="layerskbitstat"
                     unit_label="kbps"
                     bar_max="1024.f"
@@ -190,26 +212,27 @@
                     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"
                     label_spacing="256.f"
                     precision="1"
-                    show_bar="false"
-                    show_history="false"/>
+                    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"
                     label_spacing="256.f"
                     precision="1"
-                    show_bar="false"
-                    show_history="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="vfspendingoperations"
                     label="VFS Pending Operations"
+                    orientation="horizontal"
                     stat="vfspendingoperations"
                     unit_label=" Ops."
                     show_bar="false"/>
@@ -222,6 +245,7 @@
                  setting="OpenDebugStatSim">
 			  <stat_bar name="simobjects"
                   label="Objects"
+                  orientation="horizontal"
                   stat="simobjects"
                   precision="0"
                   bar_max="30000.f" 
@@ -231,6 +255,7 @@
                   show_mean="false"/>
 			  <stat_bar name="simactiveobjects"
                   label="Active Objects"
+                  orientation="horizontal"
                   stat="simactiveobjects"
                   precision="0"
                   bar_max="5000.f" 
@@ -240,6 +265,7 @@
                   show_mean="false"/>
 			  <stat_bar name="simactivescripts"
                   label="Active Scripts"
+                  orientation="horizontal"
                   stat="simactivescripts"
                   precision="0"
                   bar_max="15000.f" 
@@ -249,6 +275,7 @@
                   show_mean="false"/>
 			  <stat_bar name="siminpps"
                   label="Packets In"
+                  orientation="horizontal"
                   stat="siminpps"
                   unit_label="pps"
                   precision="0"
@@ -259,6 +286,7 @@
                   show_mean="false"/>
 			  <stat_bar name="simoutpps"
                   label="Packets Out"
+                  orientation="horizontal"
                   stat="simoutpps"
                   unit_label="pps" 
                   precision="0"
@@ -269,6 +297,7 @@
                   show_mean="false"/>
 			  <stat_bar name="simpendingdownloads"
                   label="Pending Downloads"
+                  orientation="horizontal"
                   stat="simpendingdownloads"
                   precision="0"
                   bar_max="800.f" 
@@ -278,6 +307,7 @@
                   show_mean="false"/>
 			  <stat_bar name="simpendinguploads"
                   label="Pending Uploads"
+                  orientation="horizontal"
                   stat="simpendinguploads"
                   precision="0"
                   bar_max="100.f" 
@@ -287,6 +317,7 @@
                   show_mean="false"/>
 			  <stat_bar name="simtotalunackedbytes"
                   label="Total Unacked Bytes"
+                  orientation="horizontal"
                   stat="simtotalunackedbytes"
                   unit_label="kb"
                   precision="1"
@@ -300,6 +331,7 @@
                    show_label="true">
 			    <stat_bar name="simframemsec"
                     label="Total Frame Time"
+                    orientation="horizontal"
                     stat="simframemsec"
                     unit_label="ms"
                     precision="3"
@@ -310,6 +342,7 @@
                     show_mean="false"/>
 			    <stat_bar name="simnetmsec"
                     label="Net Time"
+                    orientation="horizontal"
                     stat="simnetmsec"
                     unit_label="ms"
                     precision="3"
@@ -320,6 +353,7 @@
                     show_mean="false"/>
 			    <stat_bar name="simsimphysicsmsec"
                     label="Physics Time"
+                    orientation="horizontal"
                     stat="simsimphysicsmsec"
                     unit_label="ms"
                     precision="3"
@@ -330,6 +364,7 @@
                     show_mean="false"/>
 			    <stat_bar name="simsimothermsec"
                     label="Simulation Time"
+                    orientation="horizontal"
                     stat="simsimothermsec"
                     unit_label="ms"
                     precision="3"
@@ -340,6 +375,7 @@
                     show_mean="false"/>
 			    <stat_bar name="simagentmsec"
                     label="Agent Time"
+                    orientation="horizontal"
                     stat="simagentmsec"
                     unit_label="ms"
                     precision="3"
@@ -350,6 +386,7 @@
                     show_mean="false"/>
 			    <stat_bar name="simimagesmsec"
                     label="Images Time"
+                    orientation="horizontal"
                     stat="simimagesmsec"
                     unit_label="ms"
                     precision="3"
@@ -360,6 +397,7 @@
                     show_mean="false"/>
 			    <stat_bar name="simscriptmsec"
                     label="Script Time"
+                    orientation="horizontal"
                     stat="simscriptmsec"
                     unit_label="ms"
                     precision="3"
@@ -370,6 +408,7 @@
                     show_mean="false"/>
           <stat_bar name="simsparemsec"
                     label="Spare Time"
+                    orientation="horizontal"
                     stat="simsparemsec"
                     unit_label="ms"
                     precision="3"
@@ -384,6 +423,7 @@
                      show_label="true">
             <stat_bar name="simsimphysicsstepmsec"
                       label="  Physics Step"
+                      orientation="horizontal"
                       stat="simsimphysicsstepmsec"
                       unit_label="ms"
                       precision="3"
@@ -394,6 +434,7 @@
                       show_mean="false"/>
             <stat_bar name="simsimphysicsshapeupdatemsec"
                       label="  Update Phys Shapes"
+                      orientation="horizontal"
                       stat="simsimphysicsshapeupdatemsec"
                       unit_label="ms"
                       precision="3"
@@ -404,6 +445,7 @@
                       show_mean="false"/>
             <stat_bar name="simsimphysicsothermsec"
                       label="  Physics Other"
+                      orientation="horizontal"
                       stat="simsimphysicsothermsec"
                       unit_label="ms"
                       precision="3"
@@ -414,6 +456,7 @@
                       show_mean="false"/>
             <stat_bar name="simsleepmsec"
                       label="  Sleep Time"
+                      orientation="horizontal"
                       stat="simsleepmsec"
                       unit_label="ms"
                       precision="3"
@@ -424,6 +467,7 @@
                       show_mean="false"/>
             <stat_bar name="simpumpiomsec"
                       label="  Pump IO"
+                      orientation="horizontal"
                       stat="simpumpiomsec"
                       unit_label="ms"
                       precision="3"
-- 
cgit v1.2.3


From 935dce7d6b0a343cef5b13f53d6da5d0c2dc6a73 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 25 Mar 2013 00:18:06 -0700
Subject: SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
 fixed some compile errors made label spacing automatic on stat bars fixed
 infinite values coming from stats

---
 .../default/xui/en/floater_scene_load_stats.xml    | 42 +------------
 .../newview/skins/default/xui/en/floater_stats.xml | 71 +++-------------------
 2 files changed, 12 insertions(+), 101 deletions(-)

(limited to 'indra/newview/skins/default')

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 f4021d210a..246e8bb256 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
@@ -8,7 +8,8 @@
          save_visibility="true"
          title="SCENE LOAD STATISTICS"
          width="260">
-    <button top="20"
+    <button follows="top|left"
+            top="20"
             bottom="60"
             left="10"
             width="100"
@@ -41,7 +42,6 @@
                   stat="FramePixelDifference"
                   bar_max="100"
                   tick_spacing="10"
-                  label_spacing="20"
                   unit_scale="100"
                   precision="0"/>
         <stat_bar name="bandwidth"
@@ -51,7 +51,6 @@
                   stat="kbitstat"
                   bar_max="5000"
                   tick_spacing="500"
-                  label_spacing="1000"
                   precision="0"/>
 			  <stat_bar name="packet_loss"
                   label="Packet Loss"
@@ -60,7 +59,6 @@
                   stat="packetslostpercentstat"
                   bar_max="5"
                   tick_spacing="0.5"
-                  label_spacing="1"
                   precision="3"
                   show_bar="false"
                   show_mean="true"/>
@@ -81,7 +79,6 @@
                     stat="numobjectsstat"
                     bar_max="50000"
                     tick_spacing="5000"
-                    label_spacing="10000"
                     precision="0"
                     show_bar="false"/>
           <stat_bar name="newobjs"
@@ -91,7 +88,6 @@
                     stat="numnewobjectsstat"
                     bar_max="2000"
                     tick_spacing="200"
-                    label_spacing="400"
                     show_bar="false"/>
           <stat_bar name="object_cache_hits"
                     label="Object Cache Hit Rate"
@@ -100,7 +96,6 @@
                     bar_max="100"
                     unit_label="%"
                     tick_spacing="20"
-                    label_spacing="20"
                     show_history="true"
                     show_bar="false"/>
 			  </stat_view>
@@ -115,7 +110,6 @@
                     bar_max="100.f"
                     unit_label="%"
                     tick_spacing="20"
-                    label_spacing="20"
                     show_history="true"
                     show_bar="false"/>
           <stat_bar name="texture_cache_read_latency"
@@ -125,7 +119,6 @@
                     stat="texture_cache_read_latency"
                     bar_max="1000.f"
                     tick_spacing="100"
-                    label_spacing="200"
                     show_history="true"
                     show_bar="false"/>
           <stat_bar name="numimagesstat"
@@ -134,7 +127,6 @@
                     stat="numimagesstat" 
                     bar_max="8000.f" 
                     tick_spacing="2000.f"
-                    label_spacing="4000.f" 
                     show_bar="false"/>
 			    <stat_bar name="numrawimagesstat"
                     label="Raw Count"
@@ -142,7 +134,6 @@
                     stat="numrawimagesstat"
                     bar_max="8000.f" 
                     tick_spacing="2000.f"
-                    label_spacing="4000.f" 
                     show_bar="false"/>
 			  </stat_view>
 <!--Network Stats-->
@@ -157,7 +148,6 @@
                     unit_label="/sec" 
                     bar_max="1024.f" 
                     tick_spacing="128.f"
-                    label_spacing="256.f" 
                     precision="1"
                     show_bar="false"/>
 			    <stat_bar name="packetsoutstat"
@@ -167,7 +157,6 @@
                     unit_label="/sec"  
                     bar_max="1024.f" 
                     tick_spacing="128.f"
-                    label_spacing="256.f" 
                     precision="1"
                     show_bar="false"/>
 			    <stat_bar name="objectkbitstat"
@@ -177,7 +166,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    label_spacing="256.f"
                     precision="1"
                     show_bar="false"/>
 			    <stat_bar name="texturekbitstat"
@@ -187,7 +175,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    label_spacing="256.f"
                     precision="1"
                     show_bar="false"/>
 			    <stat_bar name="assetkbitstat"
@@ -197,7 +184,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    label_spacing="256.f"
                     precision="1"
                     show_bar="false"/>
 			    <stat_bar name="layerskbitstat"
@@ -207,7 +193,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    label_spacing="256.f"
                     precision="1"
                     show_bar="false"/>
 			    <stat_bar name="actualinkbitstat"
@@ -217,7 +202,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    label_spacing="256.f"
                     precision="1"
                     show_bar="false"/>
 			    <stat_bar name="actualoutkbitstat"
@@ -227,7 +211,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    label_spacing="256.f"
                     precision="1"
                     show_bar="false"/>
 			    <stat_bar name="vfspendingoperations"
@@ -250,7 +233,6 @@
                   precision="0"
                   bar_max="30000.f" 
                   tick_spacing="5000.f"
-                  label_spacing="10000.f" 
                   show_bar="false"
                   show_mean="false"/>
 			  <stat_bar name="simactiveobjects"
@@ -260,7 +242,6 @@
                   precision="0"
                   bar_max="5000.f" 
                   tick_spacing="750.f"
-                  label_spacing="1250.f" 
                   show_bar="false"
                   show_mean="false"/>
 			  <stat_bar name="simactivescripts"
@@ -270,7 +251,6 @@
                   precision="0"
                   bar_max="15000.f" 
                   tick_spacing="1875.f"
-                  label_spacing="3750.f"  
                   show_bar="false"
                   show_mean="false"/>
 			  <stat_bar name="siminpps"
@@ -281,7 +261,6 @@
                   precision="0"
                   bar_max="2000.f" 
                   tick_spacing="250.f"
-                  label_spacing="1000.f" 
                   show_bar="false"
                   show_mean="false"/>
 			  <stat_bar name="simoutpps"
@@ -292,7 +271,6 @@
                   precision="0"
                   bar_max="2000.f" 
                   tick_spacing="250.f"
-                  label_spacing="1000.f" 
                   show_bar="false"
                   show_mean="false"/>
 			  <stat_bar name="simpendingdownloads"
@@ -302,7 +280,6 @@
                   precision="0"
                   bar_max="800.f" 
                   tick_spacing="100.f"
-                  label_spacing="200.f" 
                   show_bar="false"
                   show_mean="false"/>
 			  <stat_bar name="simpendinguploads"
@@ -312,7 +289,6 @@
                   precision="0"
                   bar_max="100.f" 
                   tick_spacing="25.f"
-                  label_spacing="50.f" 
                   show_bar="false"
                   show_mean="false"/>
 			  <stat_bar name="simtotalunackedbytes"
@@ -323,7 +299,6 @@
                   precision="1"
                   bar_max="100000.f" 
                   tick_spacing="25000.f"
-                  label_spacing="50000.f" 
                   show_bar="false"
                   show_mean="false"/>
 			  <stat_view name="simperf"
@@ -337,7 +312,6 @@
                     precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    label_spacing="20.f" 
                     show_bar="false"
                     show_mean="false"/>
 			    <stat_bar name="simnetmsec"
@@ -348,7 +322,6 @@
                     precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    label_spacing="20.f" 
                     show_bar="false"
                     show_mean="false"/>
 			    <stat_bar name="simsimphysicsmsec"
@@ -359,7 +332,6 @@
                     precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    label_spacing="20.f" 
                     show_bar="false"
                     show_mean="false"/>
 			    <stat_bar name="simsimothermsec"
@@ -370,7 +342,6 @@
                     precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    label_spacing="20.f" 
                     show_bar="false"
                     show_mean="false"/>
 			    <stat_bar name="simagentmsec"
@@ -381,7 +352,6 @@
                     precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    label_spacing="20.f" 
                     show_bar="false"
                     show_mean="false"/>
 			    <stat_bar name="simimagesmsec"
@@ -392,7 +362,6 @@
                     precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    label_spacing="20.f" 
                     show_bar="false"
                     show_mean="false"/>
 			    <stat_bar name="simscriptmsec"
@@ -403,7 +372,6 @@
                     precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    label_spacing="20.f" 
                     show_bar="false"
                     show_mean="false"/>
           <stat_bar name="simsparemsec"
@@ -414,7 +382,6 @@
                     precision="3"
                     bar_max="40.f"
                     tick_spacing="10.f"
-                    label_spacing="20.f"
                     show_bar="false"
                     show_mean="false"/>
 <!--2nd level time blocks under 'Details' second-->
@@ -429,7 +396,6 @@
                       precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      label_spacing="20.f"
                       show_bar="false"
                       show_mean="false"/>
             <stat_bar name="simsimphysicsshapeupdatemsec"
@@ -440,7 +406,6 @@
                       precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      label_spacing="20.f"
                       show_bar="false"
                       show_mean="false"/>
             <stat_bar name="simsimphysicsothermsec"
@@ -451,7 +416,6 @@
                       precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      label_spacing="20.f"
                       show_bar="false"
                       show_mean="false"/>
             <stat_bar name="simsleepmsec"
@@ -462,7 +426,6 @@
                       precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      label_spacing="20.f"
                       show_bar="false"
                       show_mean="false"/>
             <stat_bar name="simpumpiomsec"
@@ -473,7 +436,6 @@
                       precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      label_spacing="20.f"
                       show_bar="false"
                       show_mean="false"/>
           </stat_view>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index a3f2fb0b9c..f98fcc349e 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -31,18 +31,17 @@
 		  <stat_view
 			 name="basic"
 			 label="Basic"
+       follows="left|top|right"
 			 show_label="true"
 			 setting="OpenDebugStatBasic">
 			<stat_bar
 			   name="fps"
-         orientation="horizontal"
 			   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">
@@ -55,7 +54,6 @@
 			   bar_min="0"
 			   bar_max="5000"
 			   tick_spacing="500"
-			   label_spacing="1000"
 				 precision="0"
 			   show_bar="true"
 			   show_history="false">
@@ -68,7 +66,6 @@
 			   bar_min="0"
 			   bar_max="5"
 			   tick_spacing="0.5"
-			   label_spacing="1"
 			   precision="3"
 			   show_bar="false"
 			   show_mean="true">
@@ -81,7 +78,6 @@
 			   bar_min="0"
 			   bar_max="5000"
 			   tick_spacing="500"
-			   label_spacing="1000"
 				 precision="0"
 			   show_bar="false"
 			   show_mean="false">
@@ -91,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
@@ -107,7 +105,6 @@
 				 bar_min="0"
 				 bar_max="10000"
 				 tick_spacing="1000"
-				 label_spacing="2000"
 				 precision="0"
 				 show_per_sec="false"
          show_bar="false">
@@ -121,7 +118,6 @@
 				 bar_min="0"
 				 bar_max="200000"
 				 tick_spacing="25000"
-				 label_spacing="50000"
 				 precision="0"
          show_bar="false">
         </stat_bar>
@@ -133,7 +129,6 @@
 				 bar_min="0"
 				 bar_max="50000"
 				 tick_spacing="5000"
-				 label_spacing="10000"
 				 precision="0"
 				 show_bar="false">
 			  </stat_bar>
@@ -145,7 +140,6 @@
 				 bar_min="0"
 				 bar_max="2000"
 				 tick_spacing="200"
-				 label_spacing="400"
 				 show_bar="false">
 			  </stat_bar>
        <stat_bar
@@ -156,7 +150,6 @@
 				 bar_max="100"
          unit_label="%"
 				 tick_spacing="20"
-				 label_spacing="20"
 				 show_history="true"
 				 show_bar="false">
         </stat_bar>
@@ -165,6 +158,7 @@
 			<stat_view
 			   name="texture"
 			   label="Texture"
+         follows="left|top|right"
 			   show_label="true">
 			  <stat_bar
 				 name="texture_cache_hits"
@@ -174,7 +168,6 @@
 				 bar_max="100.f"
          unit_label="%"
 				 tick_spacing="20"
-				 label_spacing="20"
 				 show_history="true"
 				 show_bar="false">
         </stat_bar>
@@ -186,7 +179,6 @@
 				 bar_min="0.f"
 				 bar_max="1000.f"
 				 tick_spacing="100"
-				 label_spacing="200"
 				 show_history="true"
 				 show_bar="false">
         </stat_bar>
@@ -197,7 +189,6 @@
 				 bar_min="0.f"
 				 bar_max="8000.f" 
 				 tick_spacing="2000.f"
-				 label_spacing="4000.f" 
 				 show_bar="false">
 			  </stat_bar>
 
@@ -208,7 +199,6 @@
 				 bar_min="0.f"
 				 bar_max="8000.f" 
 				 tick_spacing="2000.f"
-				 label_spacing="4000.f" 
 				 show_bar="false">
 			  </stat_bar>
 
@@ -221,7 +211,6 @@
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
-				 label_spacing="200.f" 
 				 precision="1"
          show_bar="false">
         </stat_bar>
@@ -235,7 +224,6 @@
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
-				 label_spacing="200.f" 
 				 precision="3"
          show_bar="false">
         </stat_bar>
@@ -249,7 +237,6 @@
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
-				 label_spacing="200.f" 
 				 precision="3"
          show_bar="false">
         </stat_bar>
@@ -263,7 +250,6 @@
 				 bar_min="0.f"
 				 bar_max="400.f" 
 				 tick_spacing="100.f"
-				 label_spacing="200.f" 
 				 precision="3"
          show_bar="false">
         </stat_bar>
@@ -272,6 +258,7 @@
 			<stat_view
 			   name="network"
 			   label="Network"
+         follows="left|top|right"
 			   show_label="true"
 			   setting="OpenDebugStatNet">
 			  <stat_bar
@@ -282,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>
@@ -295,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>
@@ -308,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>
@@ -321,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>
@@ -334,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>
@@ -347,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>
@@ -360,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" >
@@ -374,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">
@@ -393,6 +372,7 @@
 		  <stat_view
 			 name="sim"
 			 label="Simulator"
+       follows="left|top|right"
 			 show_label="true"
 			 setting="OpenDebugStatSim">
 			<stat_bar
@@ -403,7 +383,6 @@
 			   bar_min="0.f"
 			   bar_max="1.f" 
 			   tick_spacing="0.16666f"
-			   label_spacing="0.33333f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -416,7 +395,6 @@
 			   bar_min="0.f"
 			   bar_max="45.f" 
 			   tick_spacing="7.5f"
-			   label_spacing="15.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -429,7 +407,6 @@
 			   bar_min="0.f"
 			   bar_max="45.f" 
 			   tick_spacing="7.5.f"
-			   label_spacing="15.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -437,6 +414,7 @@
 			<stat_view
 			   name="physicsdetail"
 			   label="Physics Details"
+         follows="left|top|right"
 			   show_label="true">
 			  <stat_bar
 				 name="physicspinnedtasks"
@@ -446,7 +424,6 @@
 				 bar_min="0.f"
 				 bar_max="500.f" 
 				 tick_spacing="50.f"
-				 label_spacing="100.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -459,7 +436,6 @@
 				 bar_min="0.f"
 				 bar_max="500.f" 
 				 tick_spacing="50.f"
-				 label_spacing="100.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -473,7 +449,6 @@
 				 bar_min="0.f"
 				 bar_max="1024.f" 
 				 tick_spacing="128.f"
-				 label_spacing="256.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -487,7 +462,6 @@
 			   bar_min="0.f"
 			   bar_max="100.f" 
 			   tick_spacing="25.f"
-			   label_spacing="50.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -500,7 +474,6 @@
 			   bar_min="0.f"
 			   bar_max="80.f" 
 			   tick_spacing="10.f"
-			   label_spacing="40.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -513,7 +486,6 @@
 			   bar_min="0.f"
 			   bar_max="40.f" 
 			   tick_spacing="5.f"
-			   label_spacing="10.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -526,7 +498,6 @@
 			   bar_min="0.f"
 			   bar_max="30000.f" 
 			   tick_spacing="5000.f"
-			   label_spacing="10000.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -539,7 +510,6 @@
 			   bar_min="0.f"
 			   bar_max="5000.f" 
 			   tick_spacing="750.f"
-			   label_spacing="1250.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -552,7 +522,6 @@
 			   bar_min="0.f"
 			   bar_max="15000.f" 
 			   tick_spacing="1875.f"
-			   label_spacing="3750.f"  
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -564,7 +533,6 @@
             bar_min="0"
             bar_max="100"
             tick_spacing="10"
-            label_spacing="20"
             precision="3"
             show_bar="false"
             show_mean="true">
@@ -579,7 +547,6 @@
 			   bar_min="0.f"
 			   bar_max="5000.f" 
 			   tick_spacing="750.f"
-			   label_spacing="1250.f"  
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -587,6 +554,7 @@
         <stat_view
             name="simpathfinding"
             label="Pathfinding"
+            follows="left|top|right"
             show_label="true">
           <stat_bar
               name="simsimaistepmsec"
@@ -597,7 +565,6 @@
               bar_min="0.f"
               bar_max="40.f"
               tick_spacing="10.f"
-              label_spacing="20.f"
               show_bar="false"
               show_mean="false" >
           </stat_bar>
@@ -610,7 +577,6 @@
               bar_min="0"
               bar_max="45"
               tick_spacing="4"
-              label_spacing="8"
               show_bar="false">
           </stat_bar>
           <stat_bar
@@ -621,7 +587,6 @@
               bar_min="0"
               bar_max="100"
               tick_spacing="10"
-              label_spacing="20"
               precision="1"
               show_bar="false"
               show_mean="true">
@@ -637,7 +602,6 @@
 			   bar_min="0.f"
 			   bar_max="2000.f" 
 			   tick_spacing="250.f"
-			   label_spacing="1000.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -651,7 +615,6 @@
 			   bar_min="0.f"
 			   bar_max="2000.f" 
 			   tick_spacing="250.f"
-			   label_spacing="1000.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -664,7 +627,6 @@
 			   bar_min="0.f"
 			   bar_max="800.f" 
 			   tick_spacing="100.f"
-			   label_spacing="200.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -677,7 +639,6 @@
 			   bar_min="0.f"
 			   bar_max="100.f" 
 			   tick_spacing="25.f"
-			   label_spacing="50.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -691,7 +652,6 @@
 			   bar_min="0.f"
 			   bar_max="100000.f" 
 			   tick_spacing="25000.f"
-			   label_spacing="50000.f" 
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
@@ -699,6 +659,7 @@
 			<stat_view
 			   name="simperf"
 			   label="Time (ms)"
+         follows="left|top|right"
 			   show_label="true">
 			  <stat_bar
 				 name="simframemsec"
@@ -709,7 +670,6 @@
 				 bar_min="0.f"
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
-				 label_spacing="20.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -723,7 +683,6 @@
 				 bar_min="0.f"
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
-				 label_spacing="20.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -737,7 +696,6 @@
 				 bar_min="0.f"
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
-				 label_spacing="20.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -751,7 +709,6 @@
 				 bar_min="0.f"
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
-				 label_spacing="20.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -765,7 +722,6 @@
 				 bar_min="0.f"
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
-				 label_spacing="20.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -779,7 +735,6 @@
 				 bar_min="0.f"
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
-				 label_spacing="20.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -793,7 +748,6 @@
 				 bar_min="0.f"
 				 bar_max="40.f" 
 				 tick_spacing="10.f"
-				 label_spacing="20.f" 
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
@@ -807,7 +761,6 @@
          bar_min="0.f"
          bar_max="40.f"
          tick_spacing="10.f"
-         label_spacing="20.f"
          show_bar="false"
          show_mean="false" >
         </stat_bar>
@@ -815,6 +768,7 @@
           <stat_view
  			     name="timedetails"
 			     label="Time Details (ms)"
+           follows="left|top|right"
 			     show_label="true">
             <stat_bar
              name="simsimphysicsstepmsec"
@@ -825,7 +779,6 @@
              bar_min="0.f"
              bar_max="40.f"
              tick_spacing="10.f"
-             label_spacing="20.f"
              show_bar="false"
              show_mean="false" >
             </stat_bar>
@@ -838,7 +791,6 @@
              bar_min="0.f"
              bar_max="40.f"
              tick_spacing="10.f"
-             label_spacing="20.f"
              show_bar="false"
              show_mean="false" >
             </stat_bar>
@@ -851,7 +803,6 @@
              bar_min="0.f"
              bar_max="40.f"
              tick_spacing="10.f"
-             label_spacing="20.f"
              show_bar="false"
              show_mean="false" >
             </stat_bar>
@@ -864,7 +815,6 @@
              bar_min="0.f"
              bar_max="40.f"
              tick_spacing="10.f"
-             label_spacing="20.f"
              show_bar="false"
              show_mean="false" >
             </stat_bar>
@@ -877,7 +827,6 @@
              bar_min="0.f"
              bar_max="40.f"
              tick_spacing="10.f"
-             label_spacing="20.f"
              show_bar="false"
              show_mean="false" >
             </stat_bar>
-- 
cgit v1.2.3


From ab5106535758393e02b075d1e404e4e1fcf81abf Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 20 May 2013 19:27:50 -0700
Subject: SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
 removed extra dereference for copy on write pointer moved copyonwrite
 mechanism to RecordingBuffers from individual buffer fixed logic that was
 leaving scene unfrozen when camera moved during metrics gathering

---
 indra/newview/skins/default/xui/en/floater_stats.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index f98fcc349e..0493f487d4 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -38,7 +38,7 @@
 			   name="fps"
 			   label="FPS"
 			   unit_label="fps"
-			   stat="fpsstat"
+			   stat="framesrendered"
 			   bar_min="0"
 			   bar_max="60"
 			   tick_spacing="6"
-- 
cgit v1.2.3


From d136c4c29686c565b5a46503aa67a9c958b4145d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 18 Jun 2013 23:41:53 -0700
Subject: SH-4246 FIX interesting: fast timers significantly decreases
 framerate removed implicit flushes on reads from recorders for better
 performance made sure stack timers were updated on recorder deactivate faster
 rendering and better ui for fast timer view

---
 .../skins/default/xui/en/floater_fast_timers.xml   | 69 ++++++++++++++++++++++
 1 file changed, 69 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 77adb5524e..671f116df3 100755
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -16,6 +16,27 @@
  width="700">
   <string name="pause" >Pause</string>
   <string name="run">Run</string>
+  <combo_box name="time_scale_combo"
+             follows="left|top"
+             left="10"
+             top="5"
+             width="150"
+             height="20">
+    <item label="2x Average"/>
+    <item label="Max"/>
+    <item label="Recent Max"/>
+    <item label="100ms"/>
+  </combo_box>
+  <combo_box name="metric_combo"
+             follows="left|top"
+             left_pad="10"
+             top="5"
+             width="150"
+             height="20">
+    <item label="Time"/>
+    <item label="Number of Calls"/>
+    <item label="Hz"/>
+  </combo_box>
   <button follows="top|right" 
           name="pause_btn"
           left="-200"
@@ -24,4 +45,52 @@
           height="40"
           label="Pause"
           font="SansSerifHuge"/>
+  <layout_stack name="legend_stack"
+                orientation="horizontal"
+                left="0"
+                top="50"
+                right="695"
+                bottom="500"
+                follows="all">
+    <layout_panel name="legend_panel"
+                  auto_resize="false"
+                  user_resize="true"
+                  width="220"
+                  height="450"
+                  min_width="100">
+      <panel top="0"
+             left="0"
+             width="220"
+             height="440"
+             name="legend"
+             follows="all"/>
+    </layout_panel>
+    <layout_panel name="timers_panel"
+                  auto_resize="true"
+                  user_resize="true"
+                  height="450"
+                  width="475"
+                  min_width="100">
+      <layout_stack name="timer_bars_stack"
+                    orientation="vertical"
+                    left="0"
+                    top="0"
+                    width="475"
+                    height="445"
+                    follows="all">
+        <layout_panel name="bars_panel"
+                      auto_resize="true"
+                      user_resize="true"
+                      top="0"
+                      width="475"
+                      height="210"/>
+        <layout_panel name="lines_panel"
+                      auto_resize="false"
+                      user_resize="true"
+                      width="475"
+                      min_height="50"
+                      height="240"/>
+      </layout_stack>
+    </layout_panel>
+  </layout_stack>
 </floater>
-- 
cgit v1.2.3