From 0274c1f2b16e571a0cc6295d1f3073b136210a7c Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Thu, 16 Jul 2009 17:54:58 +0000
Subject: Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2. merged
 all changes, post copy, from the following branches:
 linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v

---
 indra/llmessage/tests/llcurl_stub.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llmessage/tests/llcurl_stub.cpp')

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&)
 {
-- 
cgit v1.2.3