From bedbb65b3341764ab9d076151514f7da200e6948 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 12 Feb 2015 14:10:20 -0500
Subject: STORM-2104 Statistics floaters adjustments

---
 doc/contributions.txt                                     |  1 +
 indra/llui/llstatbar.cpp                                  |  7 ++++---
 .../skins/default/xui/en/floater_scene_load_stats.xml     | 15 ++++-----------
 indra/newview/skins/default/xui/en/floater_stats.xml      |  8 ++++----
 indra/newview/skins/default/xui/en/strings.xml            |  3 +++
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index f1d8522533..1728f01c95 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -754,6 +754,7 @@ Jonathan Yap
 	STORM-2091
 	STORM-2092
 	STORM-2100
+	STORM-2104
 Kadah Coba
 	STORM-1060
     STORM-1843
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index 35f5330a3f..6c8e63442b 100644
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -40,6 +40,7 @@
 #include "lltooltip.h"
 #include "lllocalcliprect.h"
 #include <iostream>
+#include "lltrans.h"
 
 // rate at which to update display of value that is rapidly changing
 const F32 MEAN_VALUE_UPDATE_TIME = 1.f / 4.f; 
@@ -619,19 +620,19 @@ void LLStatBar::drawLabelAndValue( F32 value, std::string &label, LLRect &bar_re
 
 	std::string value_str	= !llisnan(value)
 							? llformat("%10.*f %s", decimal_digits, value, label.c_str())
-							: "n/a";
+							: LLTrans::getString("na");
 
 	// Draw the current value.
 	if (mOrientation == HORIZONTAL)
 	{
 		LLFontGL::getFontMonospace()->renderUTF8(value_str, 0, bar_rect.mRight, getRect().getHeight(), 
-			LLColor4(1.f, 1.f, 1.f, 0.5f),
+			LLColor4(1.f, 1.f, 1.f, 1.f),
 			LLFontGL::RIGHT, LLFontGL::TOP);
 	}
 	else
 	{
 		LLFontGL::getFontMonospace()->renderUTF8(value_str, 0, bar_rect.mRight, getRect().getHeight(), 
-			LLColor4(1.f, 1.f, 1.f, 0.5f),
+			LLColor4(1.f, 1.f, 1.f, 1.f),
 			LLFontGL::RIGHT, LLFontGL::TOP);
 	}
 }
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 71ff961c59..4001609746 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
@@ -7,29 +7,22 @@
          save_rect="true"
          save_visibility="true"
          title="SCENE LOAD STATISTICS"
-         width="260">
-    <button follows="top|left"
-            top="20"
-            bottom="60"
-            left="10"
-            width="100"
-            label="Pause"
-            name="playpause"/>
+         width="270">
     <scroll_container follows="top|left|bottom|right"
                       bottom="400"
                       layout="topleft"
                       left="0"
                       name="statistics_scroll"
                       reserve_scroll_corner="true"
-                      top="60"
-                      width="260">
+                      top="20"
+                      width="265">
       <container_view follows="top|left|bottom|right"
                       height="378"
                       layout="topleft"
                       left="2"
                       name="statistics_view"
                       top="20"
-                      width="245" >
+                      width="250" >
 <!--Basic Section-->
 		  <stat_view name="basic"
                  label="Basic"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 90f9591f29..be9b93837a 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -8,7 +8,7 @@
          save_rect="true"
          save_visibility="true"
          title="STATISTICS"
-         width="260">
+         width="270">
   <scroll_container follows="all"
                     height="380"
                     layout="topleft"
@@ -16,14 +16,14 @@
                     name="statistics_scroll"
                     reserve_scroll_corner="true"
                     top="20"
-                    width="260">
+                    width="265">
     <container_view follows="all"
                     height="378"
                     layout="topleft"
-                    left="2"
+                    left="0"
                     name="statistics_view"
                     top="20"
-                    width="245" >
+                    width="250" >
      <stat_view name="basic"
                  label="Basic"
                  setting="OpenDebugStatBasic">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index dcb259f2bb..00d541015b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4184,6 +4184,9 @@ Try enclosing path to the editor with double quotes.
     Loading...
   </string>
 
+  <!-- Statistics -->
+  <string name="na">n/a</string>
+
   <!-- Presets graphic/camera -->
   <string name="preset_combo_label">-Empty list-</string>
   <string name="Default">Default</string>
-- 
cgit v1.2.3