aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llprimitive/llprimitive.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llprimitive/llprimitive.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp
index c67c7d9..f1b7522 100644
--- a/linden/indra/llprimitive/llprimitive.cpp
+++ b/linden/indra/llprimitive/llprimitive.cpp
@@ -1134,7 +1134,7 @@ S32 LLPrimitive::unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 dat
1134// Pack information about all texture entries into container: 1134// Pack information about all texture entries into container:
1135// { TextureEntry Variable 2 } 1135// { TextureEntry Variable 2 }
1136// Includes information about image ID, color, scale S,T, offset S,T and rotation 1136// Includes information about image ID, color, scale S,T, offset S,T and rotation
1137BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys, bool shield) const 1137BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys, int shield) const
1138{ 1138{
1139 const U32 MAX_TES = 32; 1139 const U32 MAX_TES = 32;
1140 1140
@@ -1154,7 +1154,10 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys, bool shield) const
1154 U8 *cur_ptr = packed_buffer; 1154 U8 *cur_ptr = packed_buffer;
1155 1155
1156 S32 last_face_index = getNumTEs() - 1; 1156 S32 last_face_index = getNumTEs() - 1;
1157 1157
1158 LLUUID client_tag = LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf");//Imprudence
1159 if (shield == 2)client_tag = LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97");//IMG_DEFAULT_AVATAR
1160
1158 if (last_face_index > -1) 1161 if (last_face_index > -1)
1159 { 1162 {
1160 // ...if we hit the front, send one image id 1163 // ...if we hit the front, send one image id
@@ -1171,7 +1174,7 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys, bool shield) const
1171 if(face_index == 6)f_f_i = 10; 1174 if(face_index == 6)f_f_i = 10;
1172 if(face_index == 3)f_f_i = 11; 1175 if(face_index == 3)f_f_i = 11;
1173 if(f_f_i == face_index)memcpy(&image_ids[face_index*16],LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97").mData,16); 1176 if(f_f_i == face_index)memcpy(&image_ids[face_index*16],LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97").mData,16);
1174 else if(f_f_i == 64)memcpy(&image_ids[face_index*16],LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf").mData,16); 1177 else if(f_f_i == 64)memcpy(&image_ids[face_index*16],client_tag.mData,16);
1175 else memcpy(&image_ids[face_index*16],LLUUID("4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6").mData,16);//grey block 1178 else memcpy(&image_ids[face_index*16],LLUUID("4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6").mData,16);//grey block
1176 }else memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16); /* Flawfinder: ignore */ 1179 }else memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16); /* Flawfinder: ignore */
1177 1180