svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9a

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index d446730c33..a1b63ead75 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -1100,6 +1100,17 @@ void LLMessageSystem::forwardReliable(const U32 circuit_code)
 	sendReliable(findHost(circuit_code));
 }
 
+S32 LLMessageSystem::forwardReliable(	const LLHost &host, 
+										S32 retries, 
+										BOOL ping_based_timeout,
+										F32 timeout, 
+										void (*callback)(void **,S32), 
+										void ** callback_data)
+{
+	copyMessageRtoS();
+	return sendReliable(host, retries, ping_based_timeout, timeout, callback, callback_data);
+}
+
 S32 LLMessageSystem::flushSemiReliable(const LLHost &host, void (*callback)(void **,S32), void ** callback_data)
 {
 	F32 timeout;