diff options
author | Armin Weatherwax | 2009-12-02 00:07:49 +0100 |
---|---|---|
committer | Armin Weatherwax | 2009-12-02 00:07:49 +0100 |
commit | 283355e60b698cc51057ee4c86b2d0c35bdfabe4 (patch) | |
tree | d1dc5231515fa87e94ccc62de14f2ed849b5527b /linden/indra/newview/llvoavatar.cpp | |
parent | Emeralds client name tag and clothing layer protection. Needs decision about ... (diff) | |
download | meta-impy-283355e60b698cc51057ee4c86b2d0c35bdfabe4.zip meta-impy-283355e60b698cc51057ee4c86b2d0c35bdfabe4.tar.gz meta-impy-283355e60b698cc51057ee4c86b2d0c35bdfabe4.tar.bz2 meta-impy-283355e60b698cc51057ee4c86b2d0c35bdfabe4.tar.xz |
added our uuid
modified: linden/indra/llprimitive/llprimitive.cpp
modified: linden/indra/newview/llvoavatar.cpp
Diffstat (limited to 'linden/indra/newview/llvoavatar.cpp')
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 5f63443..b8bc6e9 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
@@ -3053,19 +3053,14 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3053 | } | 3053 | } |
3054 | else | 3054 | else |
3055 | { | 3055 | { |
3056 | /* | ||
3057 | //Imprudence FIXME: we need a inworld UUID for that | ||
3058 | //and it needs also to be at llprimitive/llprimitive.cpp (find "Imprudence FIXME" there) | ||
3059 | 3056 | ||
3060 | if(idx == LLUUID("")) | 3057 | if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf")) |
3061 | { | 3058 | { |
3062 | avatar_name_color += LLColor4(0.6f,0.8f,1.0f);//Imprudence | 3059 | avatar_name_color += LLColor4(0.6f,0.8f,1.0f);//Imprudence |
3063 | avatar_name_color = avatar_name_color * (F32)0.333333333333; | 3060 | avatar_name_color = avatar_name_color * (F32)0.333333333333; |
3064 | client = "Imprudence"; | 3061 | client = "Imprudence"; |
3065 | 3062 | ||
3066 | } else | 3063 | } else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190")) |
3067 | */ | ||
3068 | if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190")) | ||
3069 | { | 3064 | { |
3070 | avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat | 3065 | avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat |
3071 | avatar_name_color = avatar_name_color * (F32)0.333333333333; | 3066 | avatar_name_color = avatar_name_color * (F32)0.333333333333; |
@@ -3137,17 +3132,18 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3137 | avatar_name_color += LLColor4::magenta; | 3132 | avatar_name_color += LLColor4::magenta; |
3138 | avatar_name_color = avatar_name_color * (F32)0.333333333333; | 3133 | avatar_name_color = avatar_name_color * (F32)0.333333333333; |
3139 | client = "BetaLife"; | 3134 | client = "BetaLife"; |
3140 | }else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22")) | 3135 | } |
3136 | /* | ||
3137 | else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22")) | ||
3141 | { | 3138 | { |
3142 | avatar_name_color += LLColor4::green;//SimFed Poland | 3139 | avatar_name_color += LLColor4::green;//SimFed Poland |
3143 | avatar_name_color += LLColor4::blue;//SimFed Poland | 3140 | avatar_name_color += LLColor4::blue;//SimFed Poland |
3144 | avatar_name_color += LLColor4::blue;//SimFed Poland | 3141 | avatar_name_color += LLColor4::blue;//SimFed Poland |
3145 | avatar_name_color = avatar_name_color * 0.5; | 3142 | avatar_name_color = avatar_name_color * 0.5; |
3146 | client = "<-- Fag"; | 3143 | client = "<-- Fag"; //Imprudence FIXME: Cigarette? Homophobic? My lack of humor? |
3147 | 3144 | } | |
3148 | //Imprudence FIXME: Cigarette? Homophobic? My lack of humor? | 3145 | */ |
3149 | 3146 | else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat | |
3150 | }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat | ||
3151 | idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat. | 3147 | idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat. |
3152 | idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat. | 3148 | idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat. |
3153 | idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat | 3149 | idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat |