From 4607a631777b6553d4091c50e1101d9a87789a6c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 22 May 2015 10:07:49 +0200
Subject: [PATCH] More ugliness reduction: Use smooth status indicator icons
 for lagmeter

---
 indra/newview/llfloaterlagmeter.cpp           | 13 ++++++----
 .../skins/default/textures/textures.xml       |  4 ++++
 .../skins/default/xui/en/floater_lagmeter.xml | 24 +++++++++----------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp
index f72f2631a1..41d72a1337 100644
--- a/indra/newview/llfloaterlagmeter.cpp
+++ b/indra/newview/llfloaterlagmeter.cpp
@@ -40,9 +40,14 @@
 #include "llfocusmgr.h"
 #include "lltextbox.h"
 
-const std::string LAG_CRITICAL_IMAGE_NAME = "lag_status_critical.tga";
-const std::string LAG_WARNING_IMAGE_NAME  = "lag_status_warning.tga";
-const std::string LAG_GOOD_IMAGE_NAME     = "lag_status_good.tga";
+// <FS:Ansariel> Nicer icons
+//const std::string LAG_CRITICAL_IMAGE_NAME = "lag_status_critical.tga";
+//const std::string LAG_WARNING_IMAGE_NAME  = "lag_status_warning.tga";
+//const std::string LAG_GOOD_IMAGE_NAME     = "lag_status_good.tga";
+const std::string LAG_CRITICAL_IMAGE_NAME = "LagStatus_Critical";
+const std::string LAG_WARNING_IMAGE_NAME = "LagStatus_Warning";
+const std::string LAG_GOOD_IMAGE_NAME = "LagStatus_Good";
+// </FS:Ansariel>
 
 LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
 	:	LLFloater(key)
@@ -171,7 +176,7 @@ void LLFloaterLagMeter::determineClient()
 
 	if(find_cause)
 	{
-		if(gSavedSettings.getF32("RenderFarClip") > 128)
+		if(gSavedSettings.getF32("RenderFarClip") > 128.f)
 		{
 			mClientCause->setText( getString("client_draw_distance_cause_msg", mStringArgs) );
 		}
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 715fbe1c85..20740e856f 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1032,4 +1032,8 @@ with the same filename but different name
 <texture name="TrashItem_Menu" file_name="icons/TrashItem_Menu.png" preload="false" />
 
 <texture name="Active_Voice_Tab" file_name="legacy/active_voice_tab.tga" preload="false" />
+
+<texture name="LagStatus_Good" file_name="icons/green_square.png" preload="false" />
+<texture name="LagStatus_Warning" file_name="icons/yellow_square.png" preload="false" />
+<texture name="LagStatus_Critical" file_name="icons/red_square.png" preload="false" />
 </textures>
diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
index 1f22df5e82..82cbe32f0a 100644
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
@@ -179,14 +179,14 @@
     <button
      follows="top|left"
      height="16"
-     image_selected="lag_status_good.tga"
-     image_unselected="lag_status_good.tga"
+     image_selected="LagStatus_Good"
+     image_unselected="LagStatus_Good"
      layout="topleft"
      left="8"
      name="client_lagmeter"
      tab_stop="false"
      tool_tip="Client lag status"
-     top="24"
+     top="22"
      width="16" />
     <text
      type="string"
@@ -197,7 +197,7 @@
      layout="topleft"
      left_pad="3"
      name="client"
-     top_delta="0"
+     top_delta="2"
      width="128">
         Client
     </text>
@@ -227,14 +227,14 @@
     <button
      follows="top|left"
      height="16"
-     image_selected="lag_status_good.tga"
-     image_unselected="lag_status_good.tga"
+     image_selected="LagStatus_Warning"
+     image_unselected="LagStatus_Warning"
      layout="topleft"
      left="8"
      name="network_lagmeter"
      tab_stop="false"
      tool_tip="Network lag status"
-     top="64"
+     top="62"
      width="16" />
     <text
      type="string"
@@ -245,7 +245,7 @@
      layout="topleft"
      left_pad="3"
      name="network"
-     top_delta="0"
+     top_delta="2"
      width="128">
         Network
     </text>
@@ -275,14 +275,14 @@
     <button
      follows="top|left"
      height="16"
-     image_selected="lag_status_good.tga"
-     image_unselected="lag_status_good.tga"
+     image_selected="LagStatus_Critical"
+     image_unselected="LagStatus_Critical"
      layout="topleft"
      left="8"
      name="server_lagmeter"
      tab_stop="false"
      tool_tip="Server lag status"
-     top="104"
+     top="102"
      width="16" />
     <text
      type="string"
@@ -293,7 +293,7 @@
      layout="topleft"
      left_pad="3"
      name="server"
-     top_delta="0"
+     top_delta="2"
      width="60">
         Server
     </text>