summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-12-03 14:33:07 -0500
committerJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-12-03 14:33:07 -0500
commit1f05abec617f5b295749cf50fc0ba12e74bdd44a (patch)
tree534ad50e5c5feeb913373e138c2e4a59856d3a66
parent6c2101a44e367496e6a0d289aa24164adaae3d1d (diff)
parent60bbeeb0c0b03b8ad37dd47542bb8a96ab691b5e (diff)
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
-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 85cb145dbc..acb3262093 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -686,6 +686,6 @@
value="0.3 0.3 0.3 1.0" />
<color
name="ChatToastAgentNameColor"
- value="1.0 0.3 1.0 1.0" />
+ reference="EmphasisColor" />
</colors>