diff options
author | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-10-30 17:49:57 -0400 |
---|---|---|
committer | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-10-30 17:49:57 -0400 |
commit | 4aee82ad98a94ee8215109f125a899a222c80c60 (patch) | |
tree | 1f8bf2e743ffcbef1f6fda3ced9f25ae16adb4f6 | |
parent | 494b07668b86e3160ef3e549e207049c8a6870ee (diff) | |
parent | d34c8d633728300e7a46a3248ec2c23b01098477 (diff) |
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
-rw-r--r-- | indra/newview/skins/default/colors.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 6e22472153..1e0da13162 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -66,6 +66,9 @@ name="Blue" value="0 0 1 1" /> <color + name="Yellow" + value="1 1 0 1" /> + <color name="Unused?" value="1 0 1 1" /> <color @@ -411,7 +414,7 @@ reference="Green" /> <color name="MapAvatarFriendColor" - reference="Unused?" /> + reference="Yellow" /> <color name="MapAvatarSelfColor" value="0.53125 0 0.498047 1" /> |