aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorArmin Weatherwax2009-12-02 00:07:49 +0100
committerArmin Weatherwax2009-12-02 00:07:49 +0100
commit283355e60b698cc51057ee4c86b2d0c35bdfabe4 (patch)
treed1dc5231515fa87e94ccc62de14f2ed849b5527b
parentEmeralds client name tag and clothing layer protection. Needs decision about ... (diff)
downloadmeta-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
-rw-r--r--linden/indra/llprimitive/llprimitive.cpp2
-rw-r--r--linden/indra/newview/llvoavatar.cpp22
2 files changed, 10 insertions, 14 deletions
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
1369 if(face_index == 6)f_f_i = 10; 1369 if(face_index == 6)f_f_i = 10;
1370 if(face_index == 3)f_f_i = 11; 1370 if(face_index == 3)f_f_i = 11;
1371 if(f_f_i == face_index)memcpy(&image_ids[face_index*16],LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97").mData,16); 1371 if(f_f_i == face_index)memcpy(&image_ids[face_index*16],LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97").mData,16);
1372 else if(f_f_i == 64)memcpy(&image_ids[face_index*16],LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190").mData,16);//Imprudence FIXME: example 1372 else if(f_f_i == 64)memcpy(&image_ids[face_index*16],LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf").mData,16);
1373 else memcpy(&image_ids[face_index*16],LLUUID("4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6").mData,16);//grey block 1373 else memcpy(&image_ids[face_index*16],LLUUID("4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6").mData,16);//grey block
1374 }else memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16); /* Flawfinder: ignore */ 1374 }else memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16); /* Flawfinder: ignore */
1375 1375
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