From b782f9b0b48b8cb48b306b871aa02c97f3b82c34 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Fri, 2 Sep 2011 20:04:48 +0300
Subject: SH-2309 WIP Label colors changed in mesh upload floater.

---
 indra/newview/skins/default/colors.xml             |  3 +++
 .../skins/default/xui/en/floater_model_preview.xml | 26 ++++++----------------
 2 files changed, 10 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 041b72a28e..e51c50d977 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -510,6 +510,9 @@
     <color
      name="MenuPopupBgColor"
 	  reference="DkGray2" />
+    <color
+     name="ModelUploaderLabels"
+     value="1 0.6 0 1" />	  
     <color
      name="MultiSliderDisabledThumbColor"
      reference="Black" />
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 21feb9908e..2fa994dfbf 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -116,19 +116,18 @@
              top_pad="0"
              width="619" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="Source"
              layout="topleft"
              left="75"
              name="source"
+             text_color="ModelUploaderLabels"
              top="15"
              valign="center"
              value="Source"
              width="335" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -136,12 +135,12 @@
              layout="topleft"
              left_pad="0"
              name="triangles"
+             text_color="ModelUploaderLabels"
              top_delta="0"
              valign="center"
              value="Triangles"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -149,17 +148,18 @@
              layout="topleft"
              left_pad="0"
              name="vertices"
+             text_color="ModelUploaderLabels"
              valign="center"
              value="Vertices"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="High"
              layout="topleft"
              left="10"
              name="high_label"
+             text_color="ModelUploaderLabels"
              top_pad="10"
              valign="center"
              value="High"
@@ -236,7 +236,6 @@
              visible="false"
              width="55" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -248,7 +247,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -260,7 +258,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="center"
              height="18"
@@ -281,13 +278,13 @@
              top_delta="0"
              width="16" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="Medium"
              layout="topleft"
              left="10"
              name="medium_label"
+             text_color="ModelUploaderLabels"
              top_pad="15"
              valign="center"
              value="Medium"
@@ -367,7 +364,6 @@
              visible="false"
              width="55" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -379,7 +375,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -391,7 +386,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="center"
              height="18"
@@ -412,13 +406,13 @@
              top_delta="0"
              width="16" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="Low"
              layout="topleft"
              left="10"
              name="low_label"
+             text_color="ModelUploaderLabels"
              top_pad="15"
              valign="center"
              value="Low"
@@ -498,7 +492,6 @@
              visible="false"
              width="55" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -510,7 +503,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -522,7 +514,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="center"
              height="18"
@@ -543,13 +534,13 @@
              top_delta="0"
              width="16" />
             <text
-             bg_visible="true"
              follows="left|top"
              height="18"
              initial_value="Lowest"
              layout="topleft"
              left="10"
              name="lowest_label"
+             text_color="ModelUploaderLabels"
              top_pad="15"
              valign="center"
              value="Lowest"
@@ -629,7 +620,6 @@
              visible="false"
              width="55" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -641,7 +631,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="right"
              height="18"
@@ -653,7 +642,6 @@
              value="0"
              width="65" />
             <text
-             bg_visible="true"
              follows="left|top"
              halign="center"
              height="18"
-- 
cgit v1.2.3