merge release@56803 release-candidate@56833

1 files changed, 11 insertions, 2 deletions

diff --git a/indra/llmessage/lltransfertargetfile.cpp b/indra/llmessage/lltransfertargetfile.cpp
index 92776e081d..57ce069128 100644
--- a/indra/llmessage/lltransfertargetfile.cpp
+++ b/indra/llmessage/lltransfertargetfile.cpp
@@ -14,8 +14,10 @@
 
 
 
-LLTransferTargetFile::LLTransferTargetFile(const LLUUID &uuid) :
-	LLTransferTarget(LLTTT_FILE, uuid),
+LLTransferTargetFile::LLTransferTargetFile(
+	const LLUUID& uuid,
+	LLTransferSourceType src_type) :
+	LLTransferTarget(LLTTT_FILE, uuid, src_type),
 	mFP(NULL)
 {
 }
@@ -30,6 +32,13 @@ LLTransferTargetFile::~LLTransferTargetFile()
 	}
 }
 
+// virtual
+bool LLTransferTargetFile::unpackParams(LLDataPacker& dp)
+{
+	// we can safely ignore this call
+	return true;
+}
+
 void LLTransferTargetFile::applyParams(const LLTransferTargetParams &params)
 {
 	if (params.getType() != mType)