diff options
| author | McCabe Maxsted | 2010-01-04 00:22:50 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-01-04 00:22:50 -0700 |
| commit | 5189168f1620a93c14279c03b3e728f686061a4c (patch) | |
| tree | 0f1c8b0903a1ca2047a3c09ebf4cc52889b78aa8 /linden/indra/llprimitive/llprimitive.h | |
| parent | ChangeLog entry: Several changes to work better on 64bit Linux. (diff) | |
| parent | remove FIXME reminders from fixed issues (diff) | |
| download | meta-impy-5189168f1620a93c14279c03b3e728f686061a4c.zip meta-impy-5189168f1620a93c14279c03b3e728f686061a4c.tar.gz meta-impy-5189168f1620a93c14279c03b3e728f686061a4c.tar.bz2 meta-impy-5189168f1620a93c14279c03b3e728f686061a4c.tar.xz | |
Merge branch '1.3.0-clienttags' into next
Diffstat (limited to 'linden/indra/llprimitive/llprimitive.h')
| -rw-r--r-- | linden/indra/llprimitive/llprimitive.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h index cc86f5b..cf9ff0f 100644 --- a/linden/indra/llprimitive/llprimitive.h +++ b/linden/indra/llprimitive/llprimitive.h | |||
| @@ -339,7 +339,7 @@ public: | |||
| 339 | void copyTEs(const LLPrimitive *primitive); | 339 | void copyTEs(const LLPrimitive *primitive); |
| 340 | S32 packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_face_index, EMsgVariableType type) const; | 340 | S32 packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_face_index, EMsgVariableType type) const; |
| 341 | S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type); | 341 | S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type); |
| 342 | BOOL packTEMessage(LLMessageSystem *mesgsys) const; | 342 | BOOL packTEMessage(LLMessageSystem *mesgsys, bool shield = false) const; |
| 343 | BOOL packTEMessage(LLDataPacker &dp) const; | 343 | BOOL packTEMessage(LLDataPacker &dp) const; |
| 344 | S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name); | 344 | S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name); |
| 345 | S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name, const S32 block_num); // Variable num of blocks | 345 | S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name, const S32 block_num); // Variable num of blocks |