diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 15:13:07 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 15:13:07 -0700 |
| commit | e413f4b335a2f4f5a1ca151c8ab67324a72ebaee (patch) | |
| tree | 23c5343dea45f63ca2069d28d782614fd2bc6698 /indra/llprimitive/llprimitive.h | |
| parent | 6074f65991f4a9e928ef9609e90d8e9570350e63 (diff) | |
Fixup merge diffs
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
| -rwxr-xr-x | indra/llprimitive/llprimitive.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h index 6f3657cd9b..b1f8090416 100755 --- a/indra/llprimitive/llprimitive.h +++ b/indra/llprimitive/llprimitive.h @@ -392,7 +392,6 @@ public: S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type); BOOL packTEMessage(LLMessageSystem *mesgsys) const; BOOL packTEMessage(LLDataPacker &dp) const; - S32 unpackTEMessage(LLMessageSystem* mesgsys, char const* block_name); S32 unpackTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num); // Variable num of blocks BOOL unpackTEMessage(LLDataPacker &dp); S32 parseTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num, LLTEContents& tec); |