summaryrefslogtreecommitdiff
path: root/indra/llmessage/llurlrequest.cpp
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2011-08-30 09:33:05 -0400
committerprep linden <prep@lindenlab.com>2011-08-30 09:33:05 -0400
commit6f2820bcd7b7ed06fefeca0e2c34c45ef77e4b62 (patch)
tree1ba73003f2b299d6ab1a2b968c5d15688be23692 /indra/llmessage/llurlrequest.cpp
parent71ac45a28b238bac4ac0cf43ee85f04589ffa116 (diff)
parent8cef480b96dc779c5879f74224fb0a185ee550f2 (diff)
merge
Diffstat (limited to 'indra/llmessage/llurlrequest.cpp')
-rw-r--r--indra/llmessage/llurlrequest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index e8e35d00a2..d5400e4169 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -35,6 +35,7 @@
#include "llcurl.h"
#include "llioutil.h"
#include "llmemtype.h"
+#include "llproxy.h"
#include "llpumpio.h"
#include "llsd.h"
#include "llstring.h"
@@ -227,8 +228,7 @@ void LLURLRequest::useProxy(bool use_proxy)
}
}
-
- lldebugs << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (env_proxy ? env_proxy : "(null)") << llendl;
+ LL_DEBUGS("Proxy") << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (env_proxy ? env_proxy : "(null)") << LL_ENDL;
if (env_proxy && use_proxy)
{