diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 09:54:52 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 09:54:52 -0800 |
commit | 9ed8b5299f2e5a8a912649e0e6aecaf89b034408 (patch) | |
tree | e7c9ecc91fbbef0c26fd352f2743ac050d8f889e /indra/newview/skins/default/colors.xml | |
parent | 55731ee318e6e3c2e9998c6347cbd9d3635115c4 (diff) | |
parent | 3783852444825edf420e6109927df21fd004c3e7 (diff) |
Merge from remote repo
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
-rw-r--r-- | indra/newview/skins/default/colors.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 287c997c65..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 @@ -408,10 +411,10 @@ reference="White" /> <color name="MapAvatarColor" - reference="White" /> + reference="Green" /> <color name="MapAvatarFriendColor" - reference="Unused?" /> + reference="Yellow" /> <color name="MapAvatarSelfColor" value="0.53125 0 0.498047 1" /> |