From be90edeb64e4394327c0212600ff0a2d74005153 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 12 Feb 2008 18:34:39 +0000
Subject: svn merge -r 79680:79822
svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-dpo-10.1 --> release
QAR-251 - merge qa-dpo-10 (QAR-166) to release
---
indra/llmessage/llurlrequest.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/llmessage')
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index 42a64bdede..1cdaa1687d 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -235,7 +235,7 @@ void LLURLRequest::useProxy(bool use_proxy)
}
- lldebugs << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << env_proxy << llendl;
+ lldebugs << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (env_proxy ? env_proxy : "(null)") << llendl;
if (env_proxy && use_proxy)
{
--
cgit v1.2.3