diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 21:41:11 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 21:41:11 +0300 |
| commit | 93f0023efad59c6f86ee8003e3a22f1102ad28e8 (patch) | |
| tree | ffb06811136a43a737aacfa844974e206f9f5537 /indra/llmessage/llproxy.cpp | |
| parent | 922793e4898ec272576f32b79cc31b1c299e1e21 (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llmessage/llproxy.cpp')
| -rw-r--r-- | indra/llmessage/llproxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp index 537efa69d8..5730a36267 100644 --- a/indra/llmessage/llproxy.cpp +++ b/indra/llmessage/llproxy.cpp @@ -48,7 +48,7 @@ static void tcp_close_channel(LLSocket::ptr_t* handle_ptr); // Close an open TCP LLProxy::LLProxy(): mHTTPProxyEnabled(false), - mProxyMutex(NULL), + mProxyMutex(), mUDPProxy(), mTCPProxy(), mHTTPProxy(), |