diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-08 15:53:06 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-08 15:53:06 -0400 |
| commit | 5915da89f06106d0e811c6655144df93d35144f8 (patch) | |
| tree | 76e2f1ac0f232890c2edbda68d4d8845346491e2 /indra/newview/llxmlrpctransaction.cpp | |
| parent | 37f88470850cf572f30b0d1dae2f46a8e3b43977 (diff) | |
LLProxy cleanup.
Made the socks proxy start first in llstartup.cpp
Moved initialization of the proxy to before the HTTP table fetch
Added Doxygen comments to LLProxy methods.
Removed call to applyProxySettings in llxmlrpctransaction.cpp since the ctor of LLCurlEasyRequest will apply the proxy settings.
Diffstat (limited to 'indra/newview/llxmlrpctransaction.cpp')
| -rw-r--r-- | indra/newview/llxmlrpctransaction.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index 7683d4feb5..f483ba5af8 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -41,8 +41,6 @@ #include "llappviewer.h" #include "lltrans.h" -#include "llproxy.h" - // Static instance of LLXMLRPCListener declared here so that every time we // bring in this code, we instantiate a listener. If we put the static // instance of LLXMLRPCListener into llxmlrpclistener.cpp, the linker would @@ -308,8 +306,6 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip) mCurlRequest = new LLCurlEasyRequest(); } mErrorCert = NULL; - - LLProxy::getInstance()->applyProxySettings(mCurlRequest); // mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // useful for debugging mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1); |