aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llvoavatar.cpp')
-rw-r--r--linden/indra/newview/llvoavatar.cpp379
1 files changed, 191 insertions, 188 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 719aa6e..c268580 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3265,17 +3265,35 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3265{ 3265{
3266 LLUUID idx = avatar->getTE(0)->getID(); 3266 LLUUID idx = avatar->getTE(0)->getID();
3267 3267
3268 // We start locally with Imprudence in case the user has a local color they prefer. 3268 // meta 7 gets special treatment -
3269 // A) coz this is our damn viewer.
3270 // 2) makes it quicker coz everyone else around you is using it.
3271 // III) the client tags list out in the wild is wrong.
3272 // D) Casper sucks cocks, or Casper cocks suck. Probably both.
3273 if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
3274 {
3275 avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);// meta 7
3276 client = "meta 7";
3277 }
3278 // Imprudence is special to, coz dark blue on black is just unreadable. Pffft.
3279 // Also in case the user has a local color they prefer.
3269 // This means clientside colors for Imp will always override any on the website. 3280 // This means clientside colors for Imp will always override any on the website.
3270 // If you're going to add a new color, a new UUID needs to be added -- MC 3281 // If you're going to add a new color, a new UUID needs to be added -- MC
3271 if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf")) 3282 else if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
3272 { 3283 {
3284 //avatar_name_color = LLColor4(0.79f,0.44f,0.88f);// Imprudence
3273 // defaults to LLColor4(0.79f,0.44f,0.88f) 3285 // defaults to LLColor4(0.79f,0.44f,0.88f)
3274 avatar_name_color = gSavedSettings.getColor4("ImprudenceTagColor"); //Imprudence 3286 avatar_name_color = gSavedSettings.getColor4("ImprudenceTagColor"); //Imprudence
3275 client = "Imprudence"; 3287 client = "Imprudence";
3276 } 3288 }
3277 else if (LLVOAvatar::sClientResolutionList.has("isComplete") && 3289 // Don't think anyone allocates these tags, so grab one for us to.
3278 LLVOAvatar::sClientResolutionList.has(idx.asString())) 3290 else if(idx == LLUUID("f5788536-508d-4d2a-b6db-bb2b4a19f626"))
3291 {
3292 avatar_name_color = LLColor4(0.5f,0.5f,1.0f);//meta-impy
3293 client = "meta-impy";
3294 }
3295 else if(LLVOAvatar::sClientResolutionList.has("isComplete")
3296 && LLVOAvatar::sClientResolutionList.has(idx.asString()))
3279 { 3297 {
3280 LLSD cllsd = LLVOAvatar::sClientResolutionList[idx.asString()]; 3298 LLSD cllsd = LLVOAvatar::sClientResolutionList[idx.asString()];
3281 client = cllsd["name"].asString(); 3299 client = cllsd["name"].asString();
@@ -3284,191 +3302,176 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3284 avatar_name_color += colour; 3302 avatar_name_color += colour;
3285 avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f); 3303 avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);
3286 } 3304 }
3287 else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") || 3305 else
3288 idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4"))
3289 {
3290 avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
3291 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3292 client = "Meerkat";
3293 }
3294 else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
3295 {
3296 avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
3297 client = "Meta7";
3298 }
3299 else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
3300 {
3301 avatar_name_color += LLColor4::green;//emerald
3302 avatar_name_color += LLColor4::green;
3303 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3304 client = "Emerald";
3305 }
3306 else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
3307 {
3308 avatar_name_color += LLColor4::red;//vlife jcool410
3309 avatar_name_color = avatar_name_color * 0.5;
3310 client = "VLife";
3311 }
3312 else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
3313 {
3314 avatar_name_color += LLColor4::pink;//tyk3n
3315 avatar_name_color = avatar_name_color * 0.5;
3316 client = "tyk3n";
3317 }
3318 else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") ||
3319 idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
3320 {
3321 avatar_name_color += (LLColor4::purple);//psl
3322 avatar_name_color = avatar_name_color * 0.5;
3323 client = "PSL";
3324 }
3325 else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
3326 {
3327 avatar_name_color += LLColor4::red;//lordgreg
3328 avatar_name_color += LLColor4::red;
3329 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3330 client = "LGG proxy";
3331 }
3332 else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
3333 {
3334 avatar_name_color += LLColor4::blue;//day oh
3335 avatar_name_color = avatar_name_color * 0.5;
3336 client = "Day Oh proxy";
3337 }
3338 else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") ||
3339 idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") ||
3340 idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") ||
3341 idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))
3342 {
3343 avatar_name_color += LLColor4::cyan;//cryolife
3344 avatar_name_color += LLColor4::cyan;
3345 avatar_name_color = avatar_name_color * 0.5;
3346 client = "CryoLife";
3347 }
3348 else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
3349 {
3350 avatar_name_color += LLColor4::pink;//moy
3351 avatar_name_color += LLColor4::pink;//moy
3352 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3353 client = "MoyMix";
3354 }
3355 else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") ||
3356 idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))
3357 {
3358 avatar_name_color += LLColor4::yellow;//neil
3359 avatar_name_color += LLColor4::yellow;//neil
3360 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3361 client = "NeilLife";
3362 }
3363 else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
3364 {
3365 avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
3366 avatar_name_color = avatar_name_color * 0.5;//phox
3367 client = "PhoxSL";
3368 }
3369 else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))
3370 {
3371 avatar_name_color += LLColor4::white;
3372 avatar_name_color += LLColor4::white;
3373 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3374 client = "Kung Fu";
3375 }
3376 else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
3377 {
3378 avatar_name_color += LLColor4::magenta;
3379 avatar_name_color += LLColor4::magenta;
3380 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3381 client = "BetaLife";
3382 }
3383 else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
3384 {
3385 avatar_name_color += LLColor4::green;//SimFed Poland
3386 avatar_name_color += LLColor4::blue;//SimFed Poland
3387 avatar_name_color += LLColor4::blue;//SimFed Poland
3388 avatar_name_color = avatar_name_color * 0.5;
3389 client = "Copybotter";
3390 }
3391 else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
3392 idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
3393 idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
3394 idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
3395 idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-
3396 {
3397 avatar_name_color += LLColor4(0.0f,0.5f,1.0f);
3398 avatar_name_color = avatar_name_color * 0.5;
3399 client = "VerticalLife";
3400 }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
3401 {
3402 avatar_name_color += LLColor4::blue; //Sapphire
3403 avatar_name_color += LLColor4::blue; //Sapphire
3404 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3405 client = "Sapphire";
3406 }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
3407 {
3408 avatar_name_color += LLColor4::orange; //corgiVision
3409 avatar_name_color = avatar_name_color * (F32)0.75;
3410 client = "Corgi";
3411 }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
3412 {
3413 avatar_name_color += LLColor4::red; //Ruby
3414 avatar_name_color += LLColor4::purple; //Ruby
3415 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3416 client = "Ruby";
3417 }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
3418 {
3419 avatar_name_color += LLColor4::yellow9;
3420 avatar_name_color += LLColor4::yellow9;
3421 avatar_name_color *= (F32)0.333333333333;
3422 client = "Gemini";
3423 }
3424 else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))
3425 {
3426 avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3427 client = "Operator";
3428 }
3429 else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))
3430 {
3431 avatar_name_color = LLColor4(2.0f,2.0f,2.0f);
3432 avatar_name_color *= 0.33f;
3433 client = "iLife";
3434 }
3435 else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))
3436 {
3437 avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3438 client = "Gemini.Bot";
3439 }
3440 else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))
3441 {
3442 avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3443 client = "Infinity";
3444 }
3445 else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))
3446 {
3447 avatar_name_color = LLColor4(0.0f,0.6f,0.0f);
3448 avatar_name_color *= 0.33f;
3449 client = "rivlife";
3450 }
3451 else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))
3452 {
3453 avatar_name_color = LLColor4(0.69f,0.8f,1.6f);
3454 avatar_name_color *= 0.5f;
3455 client = "Anti-Life";
3456 }
3457 else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") ||
3458 idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc"))
3459 {
3460 avatar_name_color = LLColor4(0.4f,0.4f,0.4f);
3461 client = "Onyx";
3462 }
3463 else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc"))
3464 {
3465 avatar_name_color = LLColor4(1.0f,0.61176f,0.0f);
3466 client = "Whale";
3467 }
3468 else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb"))
3469 { 3306 {
3470 avatar_name_color = LLColor4(1.0f,1.0f,1.0f); 3307 if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") ||
3471 client = "nolife"; 3308 idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4"))
3309 {
3310 avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
3311 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3312 client = "Meerkat";
3313 }
3314 else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
3315 {
3316 avatar_name_color += LLColor4::green;//emerald
3317 avatar_name_color += LLColor4::green;
3318 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3319 client = "Emerald";
3320 }else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
3321 {
3322 avatar_name_color += LLColor4::red;//vlife jcool410
3323 avatar_name_color = avatar_name_color * 0.5;
3324 client = "VLife";
3325 }else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
3326 {
3327 avatar_name_color += LLColor4::pink;//tyk3n
3328 avatar_name_color = avatar_name_color * 0.5;
3329 client = "tyk3n";
3330 }else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") ||
3331 idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
3332 {
3333 avatar_name_color += (LLColor4::purple);//psl
3334 avatar_name_color = avatar_name_color * 0.5;
3335 client = "PSL";
3336 }else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
3337 {
3338 avatar_name_color += LLColor4::red;//lordgreg
3339 avatar_name_color += LLColor4::red;
3340 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3341 client = "LGG proxy";
3342 }else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
3343 {
3344 avatar_name_color += LLColor4::blue;//day oh
3345 avatar_name_color = avatar_name_color * 0.5;
3346 client = "Day Oh proxy";
3347 }else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") ||
3348 idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") ||
3349 idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") ||
3350 idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))
3351 {
3352 avatar_name_color += LLColor4::cyan;//cryolife
3353 avatar_name_color += LLColor4::cyan;
3354 avatar_name_color = avatar_name_color * 0.5;
3355 client = "CryoLife";
3356 }else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
3357 {
3358 avatar_name_color += LLColor4::pink;//moy
3359 avatar_name_color += LLColor4::pink;//moy
3360 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3361 client = "MoyMix";
3362 }else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") ||
3363 idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))
3364 {
3365 avatar_name_color += LLColor4::yellow;//neil
3366 avatar_name_color += LLColor4::yellow;//neil
3367 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3368 client = "NeilLife";
3369 }else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
3370 {
3371 avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
3372 avatar_name_color = avatar_name_color * 0.5;//phox
3373 client = "PhoxSL";
3374 }else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))
3375 {
3376 avatar_name_color += LLColor4::white;
3377 avatar_name_color += LLColor4::white;
3378 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3379 client = "Kung Fu";
3380 }else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
3381 {
3382 avatar_name_color += LLColor4::magenta;
3383 avatar_name_color += LLColor4::magenta;
3384 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3385 client = "BetaLife";
3386 }else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
3387 {
3388 avatar_name_color += LLColor4::green;//SimFed Poland
3389 avatar_name_color += LLColor4::blue;//SimFed Poland
3390 avatar_name_color += LLColor4::blue;//SimFed Poland
3391 avatar_name_color = avatar_name_color * 0.5;
3392 client = "Copybotter";
3393 }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
3394 idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
3395 idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
3396 idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
3397 idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-
3398 {
3399 avatar_name_color += LLColor4(0.0f,0.5f,1.0f);
3400 avatar_name_color = avatar_name_color * 0.5;
3401 client = "VerticalLife";
3402 }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
3403 {
3404 avatar_name_color += LLColor4::blue; //Sapphire
3405 avatar_name_color += LLColor4::blue; //Sapphire
3406 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3407 client = "Sapphire";
3408 }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
3409 {
3410 avatar_name_color += LLColor4::orange; //corgiVision
3411 avatar_name_color = avatar_name_color * (F32)0.75;
3412 client = "Corgi";
3413 }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
3414 {
3415 avatar_name_color += LLColor4::red; //Ruby
3416 avatar_name_color += LLColor4::purple; //Ruby
3417 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3418 client = "Ruby";
3419 }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
3420 {
3421 avatar_name_color += LLColor4::yellow9;
3422 avatar_name_color += LLColor4::yellow9;
3423 avatar_name_color *= (F32)0.333333333333;
3424 client = "Gemini";
3425 }
3426 else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))
3427 {
3428 avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3429 client = "Operator";
3430 }
3431 else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))
3432 {
3433 avatar_name_color = LLColor4(2.0f,2.0f,2.0f);
3434 avatar_name_color *= 0.33f;
3435 client = "iLife";
3436 }
3437 else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))
3438 {
3439 avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3440 client = "Gemini.Bot";
3441 }
3442 else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))
3443 {
3444 avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3445 client = "Infinity";
3446 }
3447 else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))
3448 {
3449 avatar_name_color = LLColor4(0.0f,0.6f,0.0f);
3450 avatar_name_color *= 0.33f;
3451 client = "rivlife";
3452 }
3453 else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))
3454 {
3455 avatar_name_color = LLColor4(0.69f,0.8f,1.6f);
3456 avatar_name_color *= 0.5f;
3457 client = "Anti-Life";
3458 }
3459 else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") ||
3460 idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc"))
3461 {
3462 avatar_name_color = LLColor4(0.4f,0.4f,0.4f);
3463 client = "Onyx";
3464 }
3465 else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc"))
3466 {
3467 avatar_name_color = LLColor4(1.0f,0.61176f,0.0f);
3468 client = "Whale";
3469 }
3470 else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb"))
3471 {
3472 avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3473 client = "nolife";
3474 }
3472 } 3475 }
3473 3476
3474 if(client.empty()) 3477 if(client.empty())