diff options
| author | Armin Weatherwax | 2009-12-02 00:07:49 +0100 |
|---|---|---|
| committer | Armin Weatherwax | 2009-12-02 00:07:49 +0100 |
| commit | 283355e60b698cc51057ee4c86b2d0c35bdfabe4 (patch) | |
| tree | d1dc5231515fa87e94ccc62de14f2ed849b5527b /linden/indra/llprimitive/llprimitive.cpp | |
| parent | Emeralds client name tag and clothing layer protection. Needs decision about ... (diff) | |
| download | meta-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
Diffstat (limited to 'linden/indra/llprimitive/llprimitive.cpp')
| -rw-r--r-- | linden/indra/llprimitive/llprimitive.cpp | 2 |
1 files changed, 1 insertions, 1 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 | ||