summaryrefslogtreecommitdiff
path: root/indra/newview/llmediadataclient.cpp
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-04-08 17:03:24 -0400
committerNyx Linden <nyx@lindenlab.com>2013-04-08 17:03:24 -0400
commitb4c60f430332674e5dbdb672152e62d252e9a6e1 (patch)
treec9fb6805638fc95ea0ca2c3ef28a41e915ad7f18 /indra/newview/llmediadataclient.cpp
parent3e53ade13e7c9e70ba67a1e845696712081f7651 (diff)
parentbeeefb45269f45ea717f58b30a0985951ae23c20 (diff)
merge. pulled in sunshine-stable.
Diffstat (limited to 'indra/newview/llmediadataclient.cpp')
-rw-r--r--indra/newview/llmediadataclient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp
index bc1aa087e5..691be13610 100644
--- a/indra/newview/llmediadataclient.cpp
+++ b/indra/newview/llmediadataclient.cpp
@@ -579,8 +579,8 @@ void LLMediaDataClient::Responder::httpFailure()
F32 retry_timeout;
#if 0
// *TODO: Honor server Retry-After header.
- if (!hasResponseHeader(HTTP_HEADER_RETRY_AFTER)
- || !getSecondsUntilRetryAfter(getResponseHeader(HTTP_HEADER_RETRY_AFTER), retry_timeout))
+ if (!hasResponseHeader(HTTP_IN_HEADER_RETRY_AFTER)
+ || !getSecondsUntilRetryAfter(getResponseHeader(HTTP_IN_HEADER_RETRY_AFTER), retry_timeout))
#endif
{
retry_timeout = mRequest->getRetryTimerDelay();