diff options
| author | David Walter Seikel | 2012-04-29 19:15:57 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2012-04-29 19:15:57 +1000 |
| commit | 5845bcd9de3b9e22952bf798d32d1b7f9cf5fa21 (patch) | |
| tree | ae172181c432e7c72857dfbc767dda2d1929b1b4 /linden | |
| parent | It's April, onefang ate all the Easter eggs. Burp. (diff) | |
| download | meta-impy-5845bcd9de3b9e22952bf798d32d1b7f9cf5fa21.zip meta-impy-5845bcd9de3b9e22952bf798d32d1b7f9cf5fa21.tar.gz meta-impy-5845bcd9de3b9e22952bf798d32d1b7f9cf5fa21.tar.bz2 meta-impy-5845bcd9de3b9e22952bf798d32d1b7f9cf5fa21.tar.xz | |
For Armin and his teapot.
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 11f4857..359ac74 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
| @@ -3287,6 +3287,11 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
| 3287 | avatar_name_color += colour; | 3287 | avatar_name_color += colour; |
| 3288 | avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f); | 3288 | avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f); |
| 3289 | } | 3289 | } |
| 3290 | else if(idx == LLUUID("7eab0700-f000-0000-0000-546561706f74")) | ||
| 3291 | { | ||
| 3292 | avatar_name_color = LLColor4(0.69f,0.42f,0.84f,1.0f); // Armins V3 viewer. | ||
| 3293 | client = "Teapot"; | ||
| 3294 | } | ||
| 3290 | else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") || | 3295 | else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") || |
| 3291 | idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4")) | 3296 | idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4")) |
| 3292 | { | 3297 | { |