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/llxfermanager.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/llxfermanager.cpp')
| -rw-r--r-- | indra/llmessage/llxfermanager.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp index 98d8a626e5..00d38c4ebc 100644 --- a/indra/llmessage/llxfermanager.cpp +++ b/indra/llmessage/llxfermanager.cpp @@ -376,7 +376,7 @@ void LLXferManager::requestFile(const char* local_filename, ELLPath remote_path, const LLHost& remote_host, BOOL delete_remote_on_completion, - void (*callback)(void**,S32), + void (*callback)(void**,S32,LLExtStat), void** user_data, BOOL is_priority, BOOL use_big_packets) @@ -433,7 +433,7 @@ void LLXferManager::requestFile(const char* remote_filename, 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, BOOL is_priority) { @@ -461,7 +461,7 @@ void LLXferManager::requestVFile(const LLUUID& local_id, const LLUUID& remote_id, LLAssetType::EType type, LLVFS* vfs, const LLHost& remote_host, - void (*callback)(void**, S32), + void (*callback)(void**,S32,LLExtStat), void** user_data, BOOL is_priority) { @@ -1131,3 +1131,4 @@ void process_abort_xfer(LLMessageSystem *mesgsys, void **user_data) + |