diff options
author | Jacek Antonelli | 2010-02-27 20:11:02 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-27 20:11:02 -0600 |
commit | 6eedfd3143c4c8b6b4e39969677acae069461fdc (patch) | |
tree | fd7fa21fbdcd9f4e948783fcd40cdb9c143ce77e | |
parent | Added ClientTagsListURL debug setting. (diff) | |
download | meta-impy-6eedfd3143c4c8b6b4e39969677acae069461fdc.zip meta-impy-6eedfd3143c4c8b6b4e39969677acae069461fdc.tar.gz meta-impy-6eedfd3143c4c8b6b4e39969677acae069461fdc.tar.bz2 meta-impy-6eedfd3143c4c8b6b4e39969677acae069461fdc.tar.xz |
Prettier default client tag color for Imprudence.
Diffstat (limited to '')
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index ebdf0b7..4cc57ee 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -5,6 +5,11 @@ | |||
5 | 5 | ||
6 | 2010-02-27 Jacek Antonelli <jacek.antonelli@gmail.com> | 6 | 2010-02-27 Jacek Antonelli <jacek.antonelli@gmail.com> |
7 | 7 | ||
8 | * Prettier default client tag color for Imprudence. | ||
9 | |||
10 | modified: linden/indra/newview/llvoavatar.cpp | ||
11 | |||
12 | |||
8 | * Added ClientTagsListURL debug setting. | 13 | * Added ClientTagsListURL debug setting. |
9 | URL to download client tags from. | 14 | URL to download client tags from. |
10 | 15 | ||
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 64e6cd7..66fd9f2 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
@@ -3104,8 +3104,7 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3104 | 3104 | ||
3105 | if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf")) | 3105 | if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf")) |
3106 | { | 3106 | { |
3107 | avatar_name_color += LLColor4(0.6f,0.8f,1.0f);//Imprudence | 3107 | avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence |
3108 | avatar_name_color = avatar_name_color * (F32)0.333333333333; | ||
3109 | client = "Imprudence"; | 3108 | client = "Imprudence"; |
3110 | 3109 | ||
3111 | } else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190")) | 3110 | } else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190")) |