diff options
author | McCabe Maxsted | 2010-06-05 13:02:24 -0700 |
---|---|---|
committer | Jacek Antonelli | 2010-06-19 02:43:31 -0500 |
commit | a8e1d2dc2bd9e73fb057bb18756170f4114b381d (patch) | |
tree | cc763fa9fcad9c8bc7e357d9b854ae978e74ec9b /linden/indra | |
parent | Ported group titles window from the Cool Viewer and placed it in the groups list (diff) | |
download | meta-impy-a8e1d2dc2bd9e73fb057bb18756170f4114b381d.zip meta-impy-a8e1d2dc2bd9e73fb057bb18756170f4114b381d.tar.gz meta-impy-a8e1d2dc2bd9e73fb057bb18756170f4114b381d.tar.bz2 meta-impy-a8e1d2dc2bd9e73fb057bb18756170f4114b381d.tar.xz |
Updated our client detection list
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 78 |
1 files changed, 66 insertions, 12 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 123b3a6..538f73d 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
@@ -3244,7 +3244,8 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3244 | avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence | 3244 | avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence |
3245 | client = "Imprudence"; | 3245 | client = "Imprudence"; |
3246 | 3246 | ||
3247 | }else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190")) | 3247 | }else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") || |
3248 | idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4")) | ||
3248 | { | 3249 | { |
3249 | avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat | 3250 | avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat |
3250 | avatar_name_color = avatar_name_color * (F32)0.333333333333; | 3251 | avatar_name_color = avatar_name_color * (F32)0.333333333333; |
@@ -3269,7 +3270,8 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3269 | avatar_name_color += LLColor4::pink;//tyk3n | 3270 | avatar_name_color += LLColor4::pink;//tyk3n |
3270 | avatar_name_color = avatar_name_color * 0.5; | 3271 | avatar_name_color = avatar_name_color * 0.5; |
3271 | client = "tyk3n"; | 3272 | client = "tyk3n"; |
3272 | }else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") || idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c")) | 3273 | }else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") || |
3274 | idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c")) | ||
3273 | { | 3275 | { |
3274 | avatar_name_color += (LLColor4::purple);//psl | 3276 | avatar_name_color += (LLColor4::purple);//psl |
3275 | avatar_name_color = avatar_name_color * 0.5; | 3277 | avatar_name_color = avatar_name_color * 0.5; |
@@ -3285,7 +3287,10 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3285 | avatar_name_color += LLColor4::blue;//day oh | 3287 | avatar_name_color += LLColor4::blue;//day oh |
3286 | avatar_name_color = avatar_name_color * 0.5; | 3288 | avatar_name_color = avatar_name_color * 0.5; |
3287 | client = "Day Oh proxy"; | 3289 | client = "Day Oh proxy"; |
3288 | }else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") || idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786")) | 3290 | }else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") || |
3291 | idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") || | ||
3292 | idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") || | ||
3293 | idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea")) | ||
3289 | { | 3294 | { |
3290 | avatar_name_color += LLColor4::cyan;//cryolife | 3295 | avatar_name_color += LLColor4::cyan;//cryolife |
3291 | avatar_name_color += LLColor4::cyan; | 3296 | avatar_name_color += LLColor4::cyan; |
@@ -3297,7 +3302,8 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3297 | avatar_name_color += LLColor4::pink;//moy | 3302 | avatar_name_color += LLColor4::pink;//moy |
3298 | avatar_name_color = avatar_name_color * (F32)0.333333333333; | 3303 | avatar_name_color = avatar_name_color * (F32)0.333333333333; |
3299 | client = "MoyMix"; | 3304 | client = "MoyMix"; |
3300 | }else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47")) | 3305 | }else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") || |
3306 | idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58")) | ||
3301 | { | 3307 | { |
3302 | avatar_name_color += LLColor4::yellow;//neil | 3308 | avatar_name_color += LLColor4::yellow;//neil |
3303 | avatar_name_color += LLColor4::yellow;//neil | 3309 | avatar_name_color += LLColor4::yellow;//neil |
@@ -3308,7 +3314,7 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3308 | avatar_name_color += LLColor4(0.0f,1.0f,1.0f); | 3314 | avatar_name_color += LLColor4(0.0f,1.0f,1.0f); |
3309 | avatar_name_color = avatar_name_color * 0.5;//phox | 3315 | avatar_name_color = avatar_name_color * 0.5;//phox |
3310 | client = "PhoxSL"; | 3316 | client = "PhoxSL"; |
3311 | }else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014") || idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b")) | 3317 | }else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014")) |
3312 | { | 3318 | { |
3313 | avatar_name_color += LLColor4::white; | 3319 | avatar_name_color += LLColor4::white; |
3314 | avatar_name_color += LLColor4::white; | 3320 | avatar_name_color += LLColor4::white; |
@@ -3326,13 +3332,12 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3326 | avatar_name_color += LLColor4::blue;//SimFed Poland | 3332 | avatar_name_color += LLColor4::blue;//SimFed Poland |
3327 | avatar_name_color += LLColor4::blue;//SimFed Poland | 3333 | avatar_name_color += LLColor4::blue;//SimFed Poland |
3328 | avatar_name_color = avatar_name_color * 0.5; | 3334 | avatar_name_color = avatar_name_color * 0.5; |
3329 | client = "CryoLife"; | 3335 | client = "Copybotter"; |
3330 | }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat | 3336 | }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat |
3331 | idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat. | 3337 | idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat. |
3332 | idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat. | 3338 | idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat. |
3333 | idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat | 3339 | idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat |
3334 | idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")//wat -.- | 3340 | idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.- |
3335 | ) | ||
3336 | { | 3341 | { |
3337 | avatar_name_color += LLColor4(0.0f,0.5f,1.0f); | 3342 | avatar_name_color += LLColor4(0.0f,0.5f,1.0f); |
3338 | avatar_name_color = avatar_name_color * 0.5; | 3343 | avatar_name_color = avatar_name_color * 0.5; |
@@ -3361,6 +3366,55 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, | |||
3361 | avatar_name_color *= (F32)0.333333333333; | 3366 | avatar_name_color *= (F32)0.333333333333; |
3362 | client = "Gemini"; | 3367 | client = "Gemini"; |
3363 | } | 3368 | } |
3369 | else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702")) | ||
3370 | { | ||
3371 | avatar_name_color = LLColor4(1.0f,1.0f,1.0f); | ||
3372 | client = "Operator"; | ||
3373 | } | ||
3374 | else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056")) | ||
3375 | { | ||
3376 | avatar_name_color = LLColor4(2.0f,2.0f,2.0f); | ||
3377 | avatar_name_color *= 0.33f; | ||
3378 | client = "iLife"; | ||
3379 | } | ||
3380 | else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5")) | ||
3381 | { | ||
3382 | avatar_name_color = LLColor4(1.0f,1.0f,1.0f); | ||
3383 | client = "Gemini.Bot"; | ||
3384 | } | ||
3385 | else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1")) | ||
3386 | { | ||
3387 | avatar_name_color = LLColor4(1.0f,1.0f,1.0f); | ||
3388 | client = "Infinity"; | ||
3389 | } | ||
3390 | else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37")) | ||
3391 | { | ||
3392 | avatar_name_color = LLColor4(0.0f,0.6f,0.0f); | ||
3393 | avatar_name_color *= 0.33f; | ||
3394 | client = "rivlife"; | ||
3395 | } | ||
3396 | else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee")) | ||
3397 | { | ||
3398 | avatar_name_color = LLColor4(0.69f,0.8f,1.6f); | ||
3399 | avatar_name_color *= 0.5f; | ||
3400 | client = "Anti-Life"; | ||
3401 | } | ||
3402 | else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") || | ||
3403 | idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc")) | ||
3404 | { | ||
3405 | avatar_name_color = LLColor4(0.4f,0.4f,0.4f); | ||
3406 | client = "Onyx"; | ||
3407 | } | ||
3408 | else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc")) | ||
3409 | { | ||
3410 | avatar_name_color = LLColor4(1.0f,0.61176f,0.0f); | ||
3411 | client = "Whale"; | ||
3412 | } | ||
3413 | else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb")) | ||
3414 | { | ||
3415 | avatar_name_color = LLColor4(1.0f,1.0f,1.0f); | ||
3416 | client = "nolife"; | ||
3417 | } | ||
3364 | } | 3418 | } |
3365 | if(client.empty()) | 3419 | if(client.empty()) |
3366 | { | 3420 | { |