diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-12 18:34:39 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-12 18:34:39 +0000 |
| commit | be90edeb64e4394327c0212600ff0a2d74005153 (patch) | |
| tree | 8bd46f61a32360613ea9dee37b12919373719dcc /indra | |
| parent | 4b39451ff14a735208b9e26207a13f2a7a2a9b72 (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |