diff options
author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
---|---|---|
committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/llmessage/lltemplatemessagereader.h | |
parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/llmessage/lltemplatemessagereader.h')
-rw-r--r-- | indra/llmessage/lltemplatemessagereader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/lltemplatemessagereader.h b/indra/llmessage/lltemplatemessagereader.h index ea8bd52298..87c91d92e2 100644 --- a/indra/llmessage/lltemplatemessagereader.h +++ b/indra/llmessage/lltemplatemessagereader.h @@ -93,7 +93,7 @@ private: BOOL decodeTemplate(const U8* buffer, S32 buffer_size, // inputs LLMessageTemplate** msg_template ); // outputs - void logRanOffEndOfPacket( const LLHost& host ); + void logRanOffEndOfPacket( const LLHost& host, const S32 where, const S32 wanted ); BOOL decodeData(const U8* buffer, const LLHost& sender ); |