summaryrefslogtreecommitdiff
path: root/indra/llmessage/llhttpclientadapter.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-04-04 17:10:28 -0700
committerdolphin <dolphin@lindenlab.com>2013-04-04 17:10:28 -0700
commit56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (patch)
treec1b61940e39d615201e18259bcab1762c5a8c655 /indra/llmessage/llhttpclientadapter.cpp
parentf684d897f532bcba87cda1f72bd19efac82f6cb6 (diff)
parent460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff)
Merge with viewer-development
Diffstat (limited to 'indra/llmessage/llhttpclientadapter.cpp')
-rw-r--r--indra/llmessage/llhttpclientadapter.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llmessage/llhttpclientadapter.cpp b/indra/llmessage/llhttpclientadapter.cpp
index f5d7a9abb6..0b59209af1 100644
--- a/indra/llmessage/llhttpclientadapter.cpp
+++ b/indra/llmessage/llhttpclientadapter.cpp
@@ -43,8 +43,11 @@ void LLHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr respo
void LLHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers)
{
LLSD empty_pragma_header = headers;
- // as above
- empty_pragma_header["Pragma"] = " ";
+ if (!empty_pragma_header.has("Pragma"))
+ {
+ // as above
+ empty_pragma_header["Pragma"] = " ";
+ }
LLHTTPClient::get(url, responder, empty_pragma_header);
}