From ce0a5fe14590b8d675b885fccd5f79d7ea17a302 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Tue, 21 Aug 2007 22:17:53 +0000
Subject: 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
---
 indra/llmessage/llxfer_file.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llmessage/llxfer_file.cpp')

diff --git a/indra/llmessage/llxfer_file.cpp b/indra/llmessage/llxfer_file.cpp
index 338dbdd215..cc5b9f1add 100644
--- a/indra/llmessage/llxfer_file.cpp
+++ b/indra/llmessage/llxfer_file.cpp
@@ -103,7 +103,7 @@ S32 LLXfer_File::initializeRequest(U64 xfer_id,
 				   ELLPath remote_path,
 				   const LLHost& remote_host,
 				   BOOL delete_remote_on_completion,
-				   void (*callback)(void**,S32),
+				   void (*callback)(void**,S32,LLExtStat),
 				   void** user_data)
 {
  	S32 retval = 0;  // presume success
-- 
cgit v1.3