diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/llmessage/tests/llcurl_stub.cpp | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
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&) { |