summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-12-09 14:54:26 -0800
committerMerov Linden <merov@lindenlab.com>2010-12-09 14:54:26 -0800
commit34ab57a1e961deb791245d8120d2c59fcf690c34 (patch)
treebc004aa991e25eb54e33bf2017acdf56160eda3b /indra/newview/skins/default
parenta1839ab425dd4c878d16b8705cfb62d3974b16d1 (diff)
parentc8d1cf82eb89d46e40bf1dd28ef2a1597273f921 (diff)
STORM-584 : pull into viewer-development
Diffstat (limited to 'indra/newview/skins/default')
-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