diff options
author | Chuck Linden <chuck@lindenlab.com> | 2010-02-03 17:29:28 -0500 |
---|---|---|
committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-03 17:29:28 -0500 |
commit | 6e1f398d13ec7a0b593491ea9f00cab79e136d9a (patch) | |
tree | 5618ca57655669c5305a181e2ee94519911b7cc5 | |
parent | b8b21fe0ad720e89bd1f683b788617de5f40aa42 (diff) | |
parent | 4f98a16736a44d2eeceab4a18160015054345858 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
-rw-r--r-- | indra/newview/skins/default/colors.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index ec196245a1..ca579616d8 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -290,7 +290,7 @@ reference="Black" /> <color name="ContextSilhouetteColor" - value="0.94 0.61 0 1" /> + reference="EmphasisColor" /> <color name="DefaultHighlightDark" reference="White_10" /> @@ -602,7 +602,7 @@ value="0.39 0.39 0.39 1" /> <color name="ScriptErrorColor" - value="Red" /> + reference="Red" /> <color name="ScrollBGStripeColor" reference="Transparent" /> |