summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2010-11-30 22:40:02 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2010-11-30 22:40:02 +0200
commit23031612745c7f1094a77252b24039333420b8c5 (patch)
tree3265c22a4a60d8dbbd484e06bcc029b030400e72 /indra/newview/skins/default/xui/en
parenta2439b74df5adaed8127aac9fff94e88e15e51a9 (diff)
STORM-584 FIXED Chat font colors for "Me" and "Others" used for the bubble chat text.
Bubble chat color picker now sets the background color for the name tag and bubble chat. Label for the color picker changed to "Bubble chat background" Removed unused "BackgroundChatColor" setting, using "NameTagBackground" instead.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_colors.xml10
1 files changed, 5 insertions, 5 deletions
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 0c75399764..acc10ce50a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -275,14 +275,14 @@
height="12"
name="bubble_chat"
top_pad="20"
- width="120"
+ width="140"
>
- Bubble chat:
+ Bubble chat background:
</text>
<color_swatch
can_apply_immediately="true"
color="0 0 0 1"
- control_name="BackgroundChatColor"
+ control_name="NameTagBackground"
follows="left|top"
height="24"
label_height="0"
@@ -294,10 +294,10 @@
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
- parameter="BackgroundChatColor" />
+ parameter="NameTagBackground" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
- parameter="BackgroundChatColor" />
+ parameter="NameTagBackground" />
</color_swatch>
<slider
control_name="ChatBubbleOpacity"