summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-09 14:39:11 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-09 14:39:11 +0000
commit40c8dddc7bf279d5e8dd7d106d28f9336f00648a (patch)
tree15905164a3e8a5ff128eb76f79edd49dc69d7d66
parent3c75565675032ec1531db59716b4ab8bbb969d3c (diff)
parent5b139bdf6178696739da479106962a7d1a04fefd (diff)
merge.
-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" />