merge

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llmessage/lltransfermanager.h b/indra/llmessage/lltransfermanager.h
index 252e05d1d1..6aad153c24 100755
--- a/indra/llmessage/lltransfermanager.h
+++ b/indra/llmessage/lltransfermanager.h
@@ -199,7 +199,7 @@ public:
 
 	void				addTransferSource(LLTransferSource *sourcep);
 	LLTransferSource	*findTransferSource(const LLUUID &transfer_id);
-	BOOL				deleteTransfer(LLTransferSource *tsp);
+	void				deleteTransfer(LLTransferSource *tsp);
 
 	void					setThrottleID(const S32 throttle_id)	{ mThrottleID = throttle_id; }
 
@@ -232,7 +232,7 @@ public:
 						 const F32 priority);
 
 	LLTransferTarget		*findTransferTarget(const LLUUID &transfer_id);
-	BOOL					deleteTransfer(LLTransferTarget *ttp);
+	void					deleteTransfer(LLTransferTarget *ttp);
 
 
 	LLTransferChannelType	getChannelType() const		{ return mChannelType; }