diff options
author | Don Kjer <don@lindenlab.com> | 2013-10-29 13:20:18 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2013-10-29 13:20:18 +0000 |
commit | 7866356d7719413b952787a509ebd3c4ce8d39b1 (patch) | |
tree | a200c96afd5ab8ad6da64c14ec6211aac9d5c65f /indra/llmessage/tests/llhttpclientadapter_test.cpp | |
parent | 81fecfa9f7e8664ec4f3bcf6662fe34d4e5d41a1 (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
Merge viewer-release => sunshine-internal
Diffstat (limited to 'indra/llmessage/tests/llhttpclientadapter_test.cpp')
-rwxr-xr-x | indra/llmessage/tests/llhttpclientadapter_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/tests/llhttpclientadapter_test.cpp b/indra/llmessage/tests/llhttpclientadapter_test.cpp index cc7feeab4f..e9ce116bb3 100755 --- a/indra/llmessage/tests/llhttpclientadapter_test.cpp +++ b/indra/llmessage/tests/llhttpclientadapter_test.cpp @@ -34,7 +34,7 @@ float const HTTP_REQUEST_EXPIRY_SECS = 1.0F; std::vector<std::string> get_urls; std::vector< LLCurl::ResponderPtr > get_responders; -void LLHTTPClient::get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers, const F32 timeout) +void LLHTTPClient::get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers, const F32 timeout, bool follow_redirects) { get_urls.push_back(url); get_responders.push_back(responder); |