Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llmessage/llhttpsender.cpp b/indra/llmessage/llhttpsender.cpp
index d0bd343db6..5363088d79 100755
--- a/indra/llmessage/llhttpsender.cpp
+++ b/indra/llmessage/llhttpsender.cpp
@@ -54,14 +54,14 @@ void LLHTTPSender::send(const LLHost& host, const std::string& name,
 	// Default implementation inserts sender, message and sends HTTP POST
 	std::ostringstream stream;
 	stream << "http://" << host << "/trusted-message/" << name;
-	llinfos << "LLHTTPSender::send: POST to " << stream.str() << llendl;
+	LL_INFOS() << "LLHTTPSender::send: POST to " << stream.str() << LL_ENDL;
 	LLHTTPClient::post(stream.str(), body, response);
 }
 
 //static 
 void LLHTTPSender::setSender(const LLHost& host, LLHTTPSender* sender)
 {
-	llinfos << "LLHTTPSender::setSender " << host << llendl;
+	LL_INFOS() << "LLHTTPSender::setSender " << host << LL_ENDL;
 	senderMap[host] = sender;
 }