diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
| commit | 77dc594e79118769087c0e2094c303fc5aaea5d4 (patch) | |
| tree | ed538b0b4e1d0b1de7ecbf22f701bbb1595b967c /indra/llmessage/llproxy.cpp | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
| parent | 1afbdc79c6fb911a5ab2c87067e7b99bec92fbc6 (diff) | |
merge back late changes and tags from release branch
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) { |