From 128ec0ceaa6efdf24f05c51075853584c3d5acbc Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Mon, 15 Nov 2010 23:01:17 +0200
Subject: STORM-580 FIXED Removed "IM" font color setting as unused.

---
 indra/newview/llimfloater.cpp                      |  2 --
 indra/newview/skins/default/colors.xml             |  3 --
 .../default/xui/en/panel_preferences_colors.xml    | 41 +++-------------------
 3 files changed, 5 insertions(+), 41 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index e000abda2a..bdc0dfa7e2 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -680,8 +680,6 @@ void LLIMFloater::updateMessages()
 
 	if (messages.size())
 	{
-//		LLUIColor chat_color = LLUIColorTable::instance().getColor("IMChatColor");
-
 		LLSD chat_args;
 		chat_args["use_plain_text_chat_history"] = use_plain_text_chat_history;
 
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index f8660419b4..aeea2306f7 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -399,9 +399,6 @@
     <color
      name="HighlightParentColor"
      value="0.67 0.83 0.96 1" />
-    <color
-     name="IMChatColor"
-     reference="LtGray" />
     <color
      name="IMHistoryBgColor"
      reference="Unused?" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 036730a646..c867afe778 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -113,22 +113,22 @@
   </text>
   <color_swatch
    can_apply_immediately="true"
-   color="LtGray"
+   color="EmphasisColor_35"
    follows="left|top"
    height="24"
    label_height="0"
    label_width="60"
    layout="topleft"
    left="360"
-   name="im"
+   name="objects"
    top_pad="-15"
    width="44">
     <color_swatch.init_callback
 		 function="Pref.getUIColor"
-		 parameter="IMChatColor" />
+		 parameter="ObjectChatColor" />
     <color_swatch.commit_callback
 		 function="Pref.applyUIColor"
-		 parameter="IMChatColor" />
+		 parameter="ObjectChatColor" />
   </color_swatch>
   <text
      type="string"
@@ -141,7 +141,7 @@
      name="text_box3"
      top_delta="5"
      width="95">
-    IM
+    Objects
   </text>
   <color_swatch
    can_apply_immediately="true"
@@ -206,37 +206,6 @@
    width="95">
     Errors
   </text>
-  <color_swatch
-   can_apply_immediately="true"
-   color="EmphasisColor_35"
-   follows="left|top"
-   height="24"
-   label_height="0"
-   layout="topleft"
-   left="360"
-   name="objects"
-   top_pad="-15"
-   width="44" >
-    <color_swatch.init_callback
-		 function="Pref.getUIColor"
-		 parameter="ObjectChatColor" />
-    <color_swatch.commit_callback
-		 function="Pref.applyUIColor"
-		 parameter="ObjectChatColor" />
-  </color_swatch>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left_pad="5"
-   mouse_opaque="false"
-   name="text_box6"
-   top_delta="5"
-   width="95">
-    Objects
-  </text>
   <color_swatch
    can_apply_immediately="true"
    color="LtYellow"
-- 
cgit v1.2.3


From 10998b137ea919e6da05abcc7ad7ea528ad267af Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Tue, 16 Nov 2010 13:33:56 -0500
Subject: STORM-535 : STORM-544 : Addition of Floater Opacity controls to
 pannel_prefferences_color.xml  after loss during cleanup of preferences.

---
 .../default/xui/en/panel_preferences_colors.xml    | 57 ++++++++++++++++++++--
 1 file changed, 52 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 036730a646..f3a5409e41 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -305,7 +305,7 @@
    left="30"
    height="12"
    name="bubble_chat"
-   top_pad="28"
+   top_pad="20"
    width="120"
    >
     Bubble chat:
@@ -336,11 +336,58 @@
    height="16"
    increment="0.05"
    initial_value="1"
-   label="Opacity"
+   label="Opacity:"
    layout="topleft"
-   left_pad="15"
-   label_width="56"
+   left_pad="10"
+   label_width="70"
    name="bubble_chat_opacity"
    top_delta = "6"
-   width="347" />
+   width="378" />
+  <text
+   follows="left|top"
+   layout="topleft"
+   left="30"
+   height="12"
+   name="bubble_chat"
+   top_pad="15"
+   width="120"
+   >
+    Floater Opacity:
+  </text>
+ <slider
+   can_edit_text="false"
+   control_name="ActiveFloaterTransparency"
+   decimal_digits="2"
+   follows="left|top"
+   height="16"
+   increment="0.01"
+   initial_value="0.8"
+   layout="topleft"
+   label_width="115"
+   label="Active :"
+   left="50"
+   max_val="1.00"
+   min_val="0.00"
+   name="active"
+   show_text="true"
+   top_pad="5"
+   width="415" />
+  <slider
+   can_edit_text="false"
+   control_name="InactiveFloaterTransparency"
+   decimal_digits="2"
+   follows="left|top"
+   height="16"
+   increment="0.01"
+   initial_value="0.5"
+   layout="topleft"
+   label_width="115"
+   label="Inctive :"
+   left="50"
+   max_val="1.00"
+   min_val="0.00"
+   name="active"
+   show_text="true"
+   top_pad="5"
+   width="415" />
 </panel>
-- 
cgit v1.2.3