diff options
| author | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
| commit | b2632c50efc12eacdcadace64e6c0f1906b86ff6 (patch) | |
| tree | c32d7e9b29e37d5c30ac16dfac55733456d7eee0 /indra/llmessage/tests/llcurl_stub.cpp | |
| parent | 27cf39cdbf27fe52dcf9c70cfdadcc18ddf2e75c (diff) | |
| parent | a8d216e194327c7bee8a42c983f7f2ca01adb385 (diff) | |
Merge of my DEV-36732 work and all the main line login api work that went on.
Diffstat (limited to 'indra/llmessage/tests/llcurl_stub.cpp')
| -rw-r--r-- | indra/llmessage/tests/llcurl_stub.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/tests/llcurl_stub.cpp b/indra/llmessage/tests/llcurl_stub.cpp index d6be54336a..5dc5932fde 100644 --- a/indra/llmessage/tests/llcurl_stub.cpp +++ b/indra/llmessage/tests/llcurl_stub.cpp @@ -34,7 +34,7 @@ void LLCurl::Responder::completed(U32 status, std::basic_string<char, std::char_ } else { - error(status, reason, mContent); + errorWithContent(status, reason, mContent); } } @@ -51,7 +51,7 @@ void LLCurl::Responder::completedRaw(unsigned, { } -void LLCurl::Responder::error(unsigned, +void LLCurl::Responder::errorWithContent(unsigned, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, LLSD const&) { |