From d21b3cb19b45e5b7948dc428eb1b90c55385fe00 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Fri, 19 Jul 2013 00:47:56 +0200
Subject: [PATCH] Enforce a 60s reply delay for LLEventPollResponder

---
 indra/llmessage/aihttptimeoutpolicy.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/indra/llmessage/aihttptimeoutpolicy.cpp b/indra/llmessage/aihttptimeoutpolicy.cpp
index 65451b34a..9397701f8 100644
--- a/indra/llmessage/aihttptimeoutpolicy.cpp
+++ b/indra/llmessage/aihttptimeoutpolicy.cpp
@@ -739,6 +739,14 @@ AIHTTPTimeoutPolicyBase reply_15s(AIHTTPTimeoutPolicyBase::getDebugSettingsCurlT
 	replyOp15s
 	);
 
+// The LLEventPollResponder needs a reply delay of at least 60 seconds, and although that is the
+// default -- enforce it to be 60 seconds and not depend on CurlTimeoutReplyDelay because changing
+// it makes no sense or will break stuff.
+Reply replyOp60s(60);
+AIHTTPTimeoutPolicyBase reply_60s(AIHTTPTimeoutPolicyBase::getDebugSettingsCurlTimeout(),
+	replyOp60s
+	);
+
 // End of policy definitions.
 //=======================================================================================================
 
@@ -920,7 +928,7 @@ P(emeraldDicDownloader);
 P(environmentApplyResponder);
 P(environmentRequestResponder);
 P(estateChangeInfoResponder);
-P(eventPollResponder);
+P2(eventPollResponder,							reply_60s);
 P(fetchInventoryResponder);
 P(fetchScriptLimitsAttachmentInfoResponder);
 P(fetchScriptLimitsRegionDetailsResponder);