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/llxfer_mem.cpp | |
| 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/llxfer_mem.cpp')
| -rw-r--r-- | indra/llmessage/llxfer_mem.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmessage/llxfer_mem.cpp b/indra/llmessage/llxfer_mem.cpp index ff878dc9f2..1eda712d2b 100644 --- a/indra/llmessage/llxfer_mem.cpp +++ b/indra/llmessage/llxfer_mem.cpp @@ -116,7 +116,7 @@ S32 LLXfer_Mem::processEOF() if (mCallback) { - mCallback((void *)mBuffer,mBufferLength,mCallbackDataHandle,mCallbackResult); + mCallback((void *)mBuffer,mBufferLength,mCallbackDataHandle,mCallbackResult,LL_EXSTAT_NONE); } return(retval); @@ -129,7 +129,7 @@ S32 LLXfer_Mem::initializeRequest(U64 xfer_id, ELLPath remote_path, const LLHost& remote_host, BOOL delete_remote_on_completion, - void (*callback)(void*,S32,void**,S32), + void (*callback)(void*,S32,void**,S32,LLExtStat), void** user_data) { S32 retval = 0; // presume success @@ -198,3 +198,4 @@ U32 LLXfer_Mem::getXferTypeTag() + |