From 283355e60b698cc51057ee4c86b2d0c35bdfabe4 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Wed, 2 Dec 2009 00:07:49 +0100 Subject: added our uuid modified: linden/indra/llprimitive/llprimitive.cpp modified: linden/indra/newview/llvoavatar.cpp --- linden/indra/llprimitive/llprimitive.cpp | 2 +- linden/indra/newview/llvoavatar.cpp | 22 +++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp index c2d1d1e..fb3b540 100644 --- a/linden/indra/llprimitive/llprimitive.cpp +++ b/linden/indra/llprimitive/llprimitive.cpp @@ -1369,7 +1369,7 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys, bool shield) const if(face_index == 6)f_f_i = 10; if(face_index == 3)f_f_i = 11; if(f_f_i == face_index)memcpy(&image_ids[face_index*16],LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97").mData,16); - else if(f_f_i == 64)memcpy(&image_ids[face_index*16],LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190").mData,16);//Imprudence FIXME: example + else if(f_f_i == 64)memcpy(&image_ids[face_index*16],LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf").mData,16); else memcpy(&image_ids[face_index*16],LLUUID("4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6").mData,16);//grey block }else memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16); /* Flawfinder: ignore */ 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, } else { -/* -//Imprudence FIXME: we need a inworld UUID for that -//and it needs also to be at llprimitive/llprimitive.cpp (find "Imprudence FIXME" there) - if(idx == LLUUID("")) + if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf")) { avatar_name_color += LLColor4(0.6f,0.8f,1.0f);//Imprudence avatar_name_color = avatar_name_color * (F32)0.333333333333; client = "Imprudence"; - } else -*/ - if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190")) + } else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190")) { avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat avatar_name_color = avatar_name_color * (F32)0.333333333333; @@ -3137,17 +3132,18 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, avatar_name_color += LLColor4::magenta; avatar_name_color = avatar_name_color * (F32)0.333333333333; client = "BetaLife"; - }else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22")) + } +/* + else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22")) { avatar_name_color += LLColor4::green;//SimFed Poland avatar_name_color += LLColor4::blue;//SimFed Poland avatar_name_color += LLColor4::blue;//SimFed Poland avatar_name_color = avatar_name_color * 0.5; - client = "<-- Fag"; - -//Imprudence FIXME: Cigarette? Homophobic? My lack of humor? - - }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat + client = "<-- Fag"; //Imprudence FIXME: Cigarette? Homophobic? My lack of humor? + } +*/ + else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat. idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat. idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat -- cgit v1.1