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.cpp | |
| parent | 6074f65991f4a9e928ef9609e90d8e9570350e63 (diff) | |
Fixup merge diffs
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
| -rwxr-xr-x | indra/llprimitive/llprimitive.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 426666ff00..e5905c3a3b 100755 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -1257,7 +1257,6 @@ BOOL LLPrimitive::packTEMessage(LLDataPacker &dp) const S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num, LLTEContents& tec) { S32 retval = 0; - // temp buffer for material ID processing // data will end up in tec.material_id[] U8 material_data[LLTEContents::MAX_TES*16]; |