diff options
| author | simon <none@none> | 2013-10-23 14:14:36 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-10-23 14:14:36 -0700 |
| commit | 64c5afa196d1692cd0823ccd555f1f7bb32f529d (patch) | |
| tree | c0ee113ee6aae7009446756f4c10188134ea7179 /indra/newview/tests/lltranslate_test.cpp | |
| parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Merge latest viewer-release with FBC
Diffstat (limited to 'indra/newview/tests/lltranslate_test.cpp')
| -rwxr-xr-x | indra/newview/tests/lltranslate_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/lltranslate_test.cpp b/indra/newview/tests/lltranslate_test.cpp index fd9527d631..8ce56326d8 100755 --- a/indra/newview/tests/lltranslate_test.cpp +++ b/indra/newview/tests/lltranslate_test.cpp @@ -308,8 +308,8 @@ void LLCurl::Responder::errorWithContent(U32, std::string const&, LLSD const&) { void LLCurl::Responder::result(LLSD const&) {} LLCurl::Responder::~Responder() {} -void LLHTTPClient::get(const std::string&, const LLSD&, ResponderPtr, const LLSD&, const F32) {} -void LLHTTPClient::get(const std::string&, LLPointer<LLCurl::Responder>, const LLSD&, const F32) {} +void LLHTTPClient::get(const std::string&, const LLSD&, ResponderPtr, const LLSD&, const F32, bool) {} +void LLHTTPClient::get(const std::string&, LLPointer<LLCurl::Responder>, const LLSD&, const F32, bool) {} LLBufferStream::LLBufferStream(const LLChannelDescriptors& channels, LLBufferArray* buffer) : std::iostream(&mStreamBuf), mStreamBuf(channels, buffer) {} |