diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-20 00:25:34 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-20 00:25:34 +0200 |
| commit | db8eb0f995889e222e38748dfee647058653e3f6 (patch) | |
| tree | 39a67775fcb6af910a8519b73fa9f5c288204044 /indra/newview/llstartup.cpp | |
| parent | ccff36c8ee278129af3a8916bf931ab4ca14a76d (diff) | |
| parent | 946b28ad765dc43ad6d1c715fa93a6f7c233ce64 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 35ecc4421c..1bb3d65e05 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3029,7 +3029,7 @@ bool LLStartUp::startLLProxy() } else { - LL_WARNS("Proxy") << "Invalid other HTTP proxy configuration."<< LL_ENDL; + LL_WARNS("Proxy") << "Invalid other HTTP proxy configuration: " << httpProxyType << LL_ENDL; // Set the missing or wrong configuration back to something valid. gSavedSettings.setString("HttpProxyType", "None"); |