summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2010-12-08 23:43:25 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2010-12-08 23:43:25 +0200
commitc8d1cf82eb89d46e40bf1dd28ef2a1597273f921 (patch)
tree5adc3c9120a9bcba1c66c4a5449a1c883d7bc45a /indra/newview/skins
parent39e4303653a2eb4e6582fdea9646db8b29f96805 (diff)
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.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_colors.xml7
1 files changed, 4 insertions, 3 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 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