From 3069d8763b933b8b0ca6f35316a73b846341973d Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 7 Dec 2010 14:08:39 +0200
Subject: STORM-735 FIXED Group icons in People -> Groups now follow floater
 opacity settings.

---
 indra/newview/skins/default/xui/en/panel_group_list_item.xml | 1 +
 indra/newview/skins/default/xui/en/widgets/group_icon.xml    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index 0b84ac03c5..7d0b0890f0 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -34,6 +34,7 @@
      mouse_opaque="true"
      left="5"
      top="2"
+     use_draw_context_alpha="false"
      width="20" />
    <text
      parse_urls="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
index 58d5e19fcc..36ee6dd7eb 100644
--- a/indra/newview/skins/default/xui/en/widgets/group_icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
@@ -2,4 +2,5 @@
 <group_icon
  default_icon_name="Generic_Group"
  image_name="Generic_Group"
- name="group_icon" />
+ name="group_icon"
+ use_draw_context_alpha="false" />
-- 
cgit v1.2.3


From 80058f35edddc40c8e435c6b31d437776e632b2b Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 8 Dec 2010 17:51:11 +0200
Subject: STORM-766 FIXED The day cycle icon in environment editor now follows
 floater transparency settings.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml
index 14f9e2db95..8df5e232d9 100644
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml
@@ -44,6 +44,7 @@
      left="85"
      name="EnvDayCycle"
      top="30"
+     use_draw_context_alpha="false"
      width="200" />
     <slider
      control_name="EnvTimeSlider"
-- 
cgit v1.2.3


From c8d1cf82eb89d46e40bf1dd28ef2a1597273f921 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Wed, 8 Dec 2010 23:43:25 +0200
Subject: STORM-584 ADDITIONAL FIX When the user sets the opacity for the name
 tag the selected opacity is shown in the color swatch to the left. Fixed
 color swatch label and tooltip. Added toolltip to opacity slider.

---
 indra/newview/skins/default/xui/en/panel_preferences_colors.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

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 5797a63f4e..8a37822413 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -275,9 +275,9 @@
    height="12"
    name="bubble_chat"
    top_pad="20"
-   width="140"
+   width="450"
    >
-    Bubble chat background:
+    Name tag background color (also affects Bubble Chat):
   </text>
   <color_swatch
    can_apply_immediately="true"
@@ -290,7 +290,7 @@
    left_delta="10"
    top_pad="5"
    name="background"
-   tool_tip="Choose color for bubble chat"
+   tool_tip="Choose name tag color"
    width="44">
    <color_swatch.init_callback
     function="Pref.getUIColor"
@@ -310,6 +310,7 @@
    left_pad="10"
    label_width="70"
    name="bubble_chat_opacity"
+   tool_tip="Choose name tag opacity"
    top_delta = "6"
    width="378" />
   <text
-- 
cgit v1.2.3