diff options
author | Richard Linden <none@none> | 2011-07-07 13:34:13 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-07-07 13:34:13 -0700 |
commit | 88a90aabcb5bdede24bb451d443239e1e116c4ea (patch) | |
tree | 9399a4aefc1a9017986e1c29f9c9077d6e3c74c7 /indra/newview/skins/default/colors.xml | |
parent | 66dcc72870b19c6ada65a643ca33c779c9c9989b (diff) | |
parent | 8f7579e4e46bb8da9fece3125ae31c3bb885be96 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
-rw-r--r-- | indra/newview/skins/default/colors.xml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index b0628dfe67..76965ad14b 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -133,6 +133,15 @@ name="AvatarListItemIconVoiceLeftColor" reference="AvatarListItemIconOfflineColor" /> <color + name="BadgeImageColor" + value="0.44 0.69 0.56 1.0" /> + <color + name="BadgeBorderColor" + value="0.9 0.9 0.9 1.0" /> + <color + name="BadgeLabelColor" + reference="White" /> + <color name="ButtonBorderColor" reference="Unused?" /> <color @@ -760,7 +769,7 @@ <color name="MenuBarProjectBgColor" reference="MdBlue" /> - + <color name="MeshImportTableNormalColor" value="1 1 1 1"/> |