Merged lindenlab/viewer-release into default

1 files changed, 21 insertions, 1 deletions

diff --git a/indra/llcorehttp/httpoptions.h b/indra/llcorehttp/httpoptions.h
index 510eaa45bb..8a6de61b04 100644
--- a/indra/llcorehttp/httpoptions.h
+++ b/indra/llcorehttp/httpoptions.h
@@ -101,13 +101,31 @@ public:
 
     /// Sets the number of retries on an LLCore::HTTPRequest before the 
     /// request fails.
-	// Default:  8
+	// Default:  5
 	void				setRetries(unsigned int retries);
 	unsigned int		getRetries() const
 	{
 		return mRetries;
 	}
 
+	/// Sets minimal delay before request retries. In microseconds.
+	/// HttpPolicy will increase delay from min to max with each retry
+	// Default: 1 000 000 mcs
+	void				setMinBackoff(HttpTime delay);
+	HttpTime			getMinBackoff() const
+	{
+		return mMinRetryBackoff;
+	}
+
+	/// Sets maximum delay before request retries. In microseconds.
+	/// HttpPolicy will increase delay from min to max with each retry
+	// Default:  5 000 000 mcs
+	void				setMaxBackoff(HttpTime delay);
+	HttpTime			getMaxBackoff() const
+	{
+		return mMaxRetryBackoff;
+	}
+
 	// Default:  true
 	void				setUseRetryAfter(bool use_retry);
 	bool				getUseRetryAfter() const
@@ -166,6 +184,8 @@ protected:
 	unsigned int		mTimeout;
 	unsigned int		mTransferTimeout;
 	unsigned int		mRetries;
+	HttpTime			mMinRetryBackoff;
+	HttpTime			mMaxRetryBackoff;
 	bool				mUseRetryAfter;
 	bool				mFollowRedirects;
 	bool				mVerifyPeer;