summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/colors.xml
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-02-09 09:50:29 -0800
committerRick Pasetto <rick@lindenlab.com>2010-02-09 09:50:29 -0800
commitcf09a48bb21d553c837186cc2e7198801f06691a (patch)
treea668e28da71f9fafe6333784400dc8f24671fad6 /indra/newview/skins/default/colors.xml
parent1c1ebd0365a115c736f62fadec37e006cbf43f44 (diff)
parent8fdb199707979916d4d3c23cd19fec9fed411aba (diff)
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
-rw-r--r--indra/newview/skins/default/colors.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index ca579616d8..b33d4f73a4 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -554,7 +554,7 @@
reference="White" />
<color
name="ObjectChatColor"
- reference="EmphasisColor_35" />
+ reference="EmphasisColor" />
<color
name="OverdrivenColor"
reference="Red" />