summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/colors.xml
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-10 15:24:27 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-10 15:24:27 +0200
commitefee637e3bf1a13591d83e6cbf52acc483a6e61a (patch)
treec8c00a42d491523dae3c187884e5cb65e01f9a4f /indra/newview/skins/default/colors.xml
parentd3d389c69898c597746902f3875761f03a419800 (diff)
parent22dccc74a8fbcf3231d932db39781727833b9259 (diff)
Merge from default branch
--HG-- branch : product-engine
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" />