From ec8aac269f2418e15af2a8200e17f5d7befe0a59 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 10 Jun 2014 10:50:47 +0200
Subject: [PATCH] Fix merge error in llurlrequest.cpp.

---
 indra/llmessage/llurlrequest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index 37c1022ad8..8511cbb0bc 100755
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -251,7 +251,7 @@ void LLURLRequest::useProxy(bool use_proxy)
         }
     }
 
-    LL_DEBUGS()("Proxy") << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (env_proxy ? env_proxy : "(null)") << LL_ENDL;
+    LL_DEBUGS("Proxy") << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (env_proxy ? env_proxy : "(null)") << LL_ENDL;
 
     if (env_proxy && use_proxy)
     {