diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-14 12:38:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-14 12:38:48 -0500 |
| commit | 4924f0c99b021869967f4587df703084d2bdc8ed (patch) | |
| tree | ac9bcf265ddfc45cfbbd2db03ad1d17694952072 /indra/llmessage/llproxy.cpp | |
| parent | c0ca8e5e2e4d3f591db3175f09c0b64b6b2e10c5 (diff) | |
b782a75c99e6 backout cleanup
Diffstat (limited to 'indra/llmessage/llproxy.cpp')
| -rw-r--r-- | indra/llmessage/llproxy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp index 4a7d326c0e..9988fcd9c0 100644 --- a/indra/llmessage/llproxy.cpp +++ b/indra/llmessage/llproxy.cpp @@ -49,7 +49,7 @@ static void tcp_close_channel(LLSocket::ptr_t* handle_ptr); // Close an open TCP LLProxy::LLProxy(): mHTTPProxyEnabled(false), - mProxyMutex(), + mProxyMutex(NULL), mUDPProxy(), mTCPProxy(), mHTTPProxy(), @@ -524,7 +524,7 @@ static apr_status_t tcp_blocking_handshake(LLSocket::ptr_t handle, char * dataou */ static LLSocket::ptr_t tcp_open_channel(LLHost host) { - LLSocket::ptr_t socket = LLSocket::create(LLSocket::STREAM_TCP); + LLSocket::ptr_t socket = LLSocket::create(NULL, LLSocket::STREAM_TCP); bool connected = socket->blockingConnect(host); if (!connected) { |