diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-09 10:22:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-09 10:22:10 -0400 |
| commit | 186b60457808d5fb280531bc96aba8fc8b67ef12 (patch) | |
| tree | c2dd694263f33426a1fab690f77cba21b2035372 /indra/llprimitive | |
| parent | 1b984d8f40d805341b8c1fc670c29b32c25ce227 (diff) | |
remove duplications and other errors introduced during the merge
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index d69a23c1d7..fe0e7e0133 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -1372,15 +1372,6 @@ S32 LLPrimitive::unpackTEMessage(LLMessageSystem* mesgsys, char const* block_nam return applyParsedTEMessage(tec); } -S32 LLPrimitive::unpackTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num) -{ - LLTEContents tec; - S32 retval = parseTEMessage(mesgsys, block_name, block_num, tec); - if (!retval) - return retval; - return applyParsedTEMessage(tec); -} - S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp) { // use a negative block_num to indicate a single-block read (a non-variable block) |