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 releasemeow-7.2.2
parent
4b39451ff1
commit
be90edeb64
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue