summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/colors.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-19 15:58:53 -0500
committerOz Linden <oz@lindenlab.com>2010-11-19 15:58:53 -0500
commitf6ba55b8ed24246be340d069c64d25bd614194a6 (patch)
tree3475f87a3326be076158597ecc7e96f341080f2f /indra/newview/skins/default/colors.xml
parent3b85391839da9077129830258d4a1d1ce6069cb3 (diff)
parent0f72f152e88efd7fc56cf6764f25bd2d0d4bf062 (diff)
merge fix for STORM-138
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
-rw-r--r--indra/newview/skins/default/colors.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index ddd2ff196b..aeea2306f7 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -400,9 +400,6 @@
name="HighlightParentColor"
value="0.67 0.83 0.96 1" />
<color
- name="IMChatColor"
- reference="LtGray" />
- <color
name="IMHistoryBgColor"
reference="Unused?" />
<color
@@ -767,9 +764,6 @@
name="SysWellItemSelected"
value="0.3 0.3 0.3 1.0" />
<color
- name="ChatToastAgentNameColor"
- reference="EmphasisColor" />
- <color
name="ColorSwatchBorderColor"
value="0.45098 0.517647 0.607843 1"/>
<color