2 files changed, 4 insertions, 5 deletions
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp
index d2e64e60ac..bdffa34fbc 100644
--- a/indra/llmessage/llproxy.cpp
+++ b/indra/llmessage/llproxy.cpp
@@ -85,7 +85,7 @@ S32 LLProxy::proxyHandshake(LLHost proxy, U32 message_port)
 	socks_auth_request.methods     = getSelectedAuthMethod(); // Send only the selected method.
 
 	result = tcp_handshake(mProxyControlChannel, (char*)&socks_auth_request, sizeof(socks_auth_request), (char*)&socks_auth_response, sizeof(socks_auth_response));
-	if (result != 0)
+	if (result != APR_SUCCESS)
 	{
 		LL_WARNS("Proxy") << "SOCKS authentication request failed, error on TCP control channel : " << result << LL_ENDL;
 		stopSOCKSProxy();
@@ -118,7 +118,7 @@ S32 LLProxy::proxyHandshake(LLHost proxy, U32 message_port)
 		result = tcp_handshake(mProxyControlChannel, password_auth, request_size, (char*)&password_reply, sizeof(password_reply));
 		delete[] password_auth;
 
-		if (result != 0)
+		if (result != APR_SUCCESS)
 		{
 			LL_WARNS("Proxy") << "SOCKS authentication failed, error on TCP control channel : " << result << LL_ENDL;
 			stopSOCKSProxy();
@@ -148,7 +148,7 @@ S32 LLProxy::proxyHandshake(LLHost proxy, U32 message_port)
 	//  the client MUST use a port number and address of all zeros. RFC 1928"
 
 	result = tcp_handshake(mProxyControlChannel, (char*)&connect_request, sizeof(connect_request), (char*)&connect_reply, sizeof(connect_reply));
-	if (result != 0)
+	if (result != APR_SUCCESS)
 	{
 		LL_WARNS("Proxy") << "SOCKS connect request failed, error on TCP control channel : " << result << LL_ENDL;
 		stopSOCKSProxy();
@@ -335,7 +335,6 @@ void LLProxy::applyProxySettings(LLCurlEasyRequest* handle)
 	applyProxySettings(handle->getEasy());
 }
 
-
 void LLProxy::applyProxySettings(LLCurl::Easy* handle)
 {
 	applyProxySettings(handle->getCurlHandle());
@@ -373,7 +372,6 @@ void LLProxy::applyProxySettings(CURL* handle)
 
 static S32 tcp_handshake(LLSocket::ptr_t handle, char * dataout, apr_size_t outlen, char * datain, apr_size_t maxinlen)
 {
-
 	apr_socket_t* apr_socket = handle->getSocket();
 	apr_status_t rv = APR_SUCCESS;
 
diff --git a/indra/llmessage/llproxy.h b/indra/llmessage/llproxy.h
index 68c40561c8..534455a6dd 100644
--- a/indra/llmessage/llproxy.h
+++ b/indra/llmessage/llproxy.h
@@ -168,6 +168,7 @@ enum LLSocks5AuthType
 
 class LLProxy: public LLSingleton<LLProxy>
 {
+	LOG_CLASS(LLProxy);
 public:
 	LLProxy();
 	~LLProxy();