diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-08 14:37:37 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-08 14:37:37 -0700 |
| commit | bd482ab55e30403438aed2fc19200eae36efc96a (patch) | |
| tree | bb7aa9f5f460ffc540ccc16b6436227e05d3dc3b /indra/newview/tests/lltranslate_test.cpp | |
| parent | 54de882b81083298009e3b4a3d74fa1c7255068d (diff) | |
| parent | 7d6e3945204c05efe85eadf8a6635d0ca30e9186 (diff) | |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/newview/tests/lltranslate_test.cpp')
| -rw-r--r-- | 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 100644 --- 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) {} |