merge release@56803 release-candidate@56833

1 files changed, 20 insertions, 12 deletions

diff --git a/indra/llmessage/lltransfertargetvfile.h b/indra/llmessage/lltransfertargetvfile.h
index 7614021179..57eaeca378 100644
--- a/indra/llmessage/lltransfertargetvfile.h
+++ b/indra/llmessage/lltransfertargetvfile.h
@@ -17,26 +17,32 @@ class LLVFile;
 
 // Lame, an S32 for now until I figure out the deal with how we want to do
 // error codes.
-typedef void (*LLTTVFCompleteCallback)(const S32 status, void *user_data);
+typedef void (*LLTTVFCompleteCallback)(
+	S32 status,
+	const LLUUID& file_id,
+	LLAssetType::EType file_type,
+	void* user_data);
 
 class LLTransferTargetParamsVFile : public LLTransferTargetParams
 {
 public:
 	LLTransferTargetParamsVFile();
-	
-	void setAsset(const LLUUID &asset_id, const LLAssetType::EType asset_type);
-	void setCallback(LLTTVFCompleteCallback cb, void *user_data);
+
+	void setAsset(const LLUUID& asset_id, LLAssetType::EType asset_type);
+	void setCallback(LLTTVFCompleteCallback cb, void* user_data);
 
 	LLUUID getAssetID() const						{ return mAssetID; }
 	LLAssetType::EType getAssetType() const			{ return mAssetType; }
 
 	friend class LLTransferTargetVFile;
 protected:
+	bool unpackParams(LLDataPacker& dp);
+
 	LLUUID				mAssetID;
 	LLAssetType::EType	mAssetType;
 
 	LLTTVFCompleteCallback	mCompleteCallback;
-	void *					mUserDatap;
+	void*					mUserDatap;
 	S32						mErrCode;
 	LLVFSThread::handle_t	mHandle;
 };
@@ -45,18 +51,20 @@ protected:
 class LLTransferTargetVFile : public LLTransferTarget
 {
 public:
-	LLTransferTargetVFile(const LLUUID &uuid);
+	LLTransferTargetVFile(const LLUUID& uuid, LLTransferSourceType src_type);
 	virtual ~LLTransferTargetVFile();
 
-	static void requestTransfer(LLTransferTargetChannel *channelp,
-								const char *local_filename,
-								const LLTransferSourceParams &source_params,
-								LLTTVFCompleteCallback callback);
+	//static void requestTransfer(LLTransferTargetChannel* channelp,
+	//							const char* local_filename,
+	//							const LLTransferSourceParams& source_params,
+	//							LLTTVFCompleteCallback callback);
+
 	static void updateQueue(bool shutdown = false);
 	
 protected:
-	/*virtual*/ void applyParams(const LLTransferTargetParams &params);
-	/*virtual*/ LLTSCode dataCallback(const S32 packet_id, U8 *in_datap, const S32 in_size);
+	virtual bool unpackParams(LLDataPacker& dp);
+	/*virtual*/ void applyParams(const LLTransferTargetParams& params);
+	/*virtual*/ LLTSCode dataCallback(const S32 packet_id, U8* in_datap, const S32 in_size);
 	/*virtual*/ void completionCallback(const LLTSCode status);
 
 	LLTransferTargetParamsVFile mParams;