summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/colors.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-18 16:25:02 -0400
committerOz Linden <oz@lindenlab.com>2011-04-18 16:25:02 -0400
commit9c995e2a5ce45cc912605d077d704fa76ed904dd (patch)
tree2f790ce33f92bff08ee64c45cfee4ad8ea62f4a5 /indra/newview/skins/default/colors.xml
parent853231580aa2a6bf2894c20495c549a9d5f3c673 (diff)
parent81676d4753a1abe347a69a95f234a005aad0659f (diff)
merge up from viewer-development (with changes for storm-160 backed out)
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
-rw-r--r--indra/newview/skins/default/colors.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 75aec21f93..72a4dd7f63 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -115,9 +115,6 @@
name="AlertCautionTextColor"
reference="LtYellow" />
<color
- name="AlertTextColor"
- value="0.58 0.66 0.84 1" />
- <color
name="AvatarListItemIconDefaultColor"
reference="White" />
<color