v-r -> s-e merge WIP

3 files changed, 6 insertions, 6 deletions

diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 5f8581b4fd..a80d5a570e 100755
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -261,8 +261,8 @@ void LLCurl::Responder::completedRaw(
 	// Only emit a warning if we failed to parse when 'content-type' == 'application/llsd+xml'
 	if (!parsed && (HTTP_CONTENT_LLSD_XML == getResponseHeader(HTTP_IN_HEADER_CONTENT_TYPE)))
 	{
-		llwarns << "Failed to deserialize . " << mURL << " [status:" << mStatus << "] " 
-			<< "(" << mReason << ") body: " << debug_body << llendl;
+		LL_WARNS() << "Failed to deserialize . " << mURL << " [status:" << mStatus << "] " 
+			<< "(" << mReason << ") body: " << debug_body << LL_ENDL;
 	}
 
 	httpCompleted();
@@ -543,7 +543,7 @@ void LLCurl::Easy::slist_append(const char* str)
 		mHeaders = curl_slist_append(mHeaders, str);
 		if (!mHeaders)
 		{
-			llwarns << "curl_slist_append() call returned NULL appending " << str << llendl;
+			LL_WARNS() << "curl_slist_append() call returned NULL appending " << str << LL_ENDL;
 		}
 	}
 }
@@ -934,7 +934,7 @@ S32 LLCurl::Multi::process()
 			else
 			{
 				response = HTTP_INTERNAL_ERROR;
-				//*TODO: change to llwarns
+				//*TODO: change to LL_WARNS()
 				LL_ERRS() << "cleaned up curl request completed!" << LL_ENDL;
 			}
 			if (response >= 400)
diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp
index cdd8d25f16..d9042fa8b0 100755
--- a/indra/llmessage/lliohttpserver.cpp
+++ b/indra/llmessage/lliohttpserver.cpp
@@ -352,7 +352,7 @@ void LLHTTPPipe::Response::extendedResult(S32 code, const LLSD& r, const LLSD& h
 {
 	if(! mPipe)
 	{
-		llwarns << "LLHTTPPipe::Response::extendedResult: NULL pipe" << llendl;
+		LL_WARNS() << "LLHTTPPipe::Response::extendedResult: NULL pipe" << LL_ENDL;
 		return;
 	}
 
diff --git a/indra/llmessage/llsdappservices.cpp b/indra/llmessage/llsdappservices.cpp
index 577429a941..4ca45267bd 100755
--- a/indra/llmessage/llsdappservices.cpp
+++ b/indra/llmessage/llsdappservices.cpp
@@ -120,7 +120,7 @@ public:
 	virtual bool validate(const std::string& name, LLSD& context) const
 	{
 		//LL_INFOS() << "validate: " << name << ", "
-		//	<< LLSDOStreamer<LLSDNotationFormatter>(context) << llendl;
+		//	<< LLSDOStreamer<LLSDNotationFormatter>(context) << LL_ENDL;
 		if((std::string("PUT") == context[CONTEXT_REQUEST][CONTEXT_VERB].asString()) && !name.empty())
 		{
 			return true;