diff options
| author | James Cook <james@lindenlab.com> | 2010-05-19 10:25:52 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-19 10:25:52 -0700 |
| commit | d822206a48633e03f7456663d7d7d82b73ba209f (patch) | |
| tree | e7849fffafdd0ee06e63e744bce9f22c6e6d82bd /indra/newview/skins | |
| parent | cbc9fcabf945558ef22d35e2957ae9f1c879ef7b (diff) | |
Remove colors for match/mismatch/friends from name tags
Product team request. Reviewed with Leyla
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_general.xml | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index bb43de6ada..bfa57892a7 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -550,7 +550,7 @@ reference="White" /> <color name="NameTagMismatch" - value="1 0.776 0.212 1" /> + reference="White" /> <color name="NameTagSLID" value="1 1 1 1" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 5f50b962ee..eabbdc2186 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -256,7 +256,16 @@ name="show_my_name_checkbox1" top_pad="4" width="300" /> - <text + <check_box + control_name="NameTagShowFriends" + enabled_control="AvatarNameTagMode" + height="16" + label="Highlight friends" + left_delta="0" + name="show_friends" + tool_tip="Highlight the name tags of your friends" + top_pad="2" /> + <text follows="left|top" height="15" layout="topleft" |