diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-04-08 17:03:24 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-08 17:03:24 -0400 |
| commit | b4c60f430332674e5dbdb672152e62d252e9a6e1 (patch) | |
| tree | c9fb6805638fc95ea0ca2c3ef28a41e915ad7f18 /indra/llmessage/llavatarnamecache.cpp | |
| parent | 3e53ade13e7c9e70ba67a1e845696712081f7651 (diff) | |
| parent | beeefb45269f45ea717f58b30a0985951ae23c20 (diff) | |
merge. pulled in sunshine-stable.
Diffstat (limited to 'indra/llmessage/llavatarnamecache.cpp')
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 1d01b69969..e0b71acbd5 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -711,13 +711,9 @@ bool LLAvatarNameCache::expirationFromCacheControl(const LLSD& headers, F64 *exp // Allow the header to override the default std::string cache_control; - if (headers.has(HTTP_HEADER_CACHE_CONTROL)) + if (headers.has(HTTP_IN_HEADER_CACHE_CONTROL)) { - cache_control = headers[HTTP_HEADER_CACHE_CONTROL].asString(); - } - else if (headers.has(HTTP_HEADER_LOWER_CACHE_CONTROL)) - { - cache_control = headers[HTTP_HEADER_LOWER_CACHE_CONTROL].asString(); + cache_control = headers[HTTP_IN_HEADER_CACHE_CONTROL].asString(); } if (!cache_control.empty()) |