diff options
author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/llmessage/net.cpp | |
parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llmessage/net.cpp')
-rw-r--r-- | indra/llmessage/net.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmessage/net.cpp b/indra/llmessage/net.cpp index 8cd7180f9a..2d3215f47c 100644 --- a/indra/llmessage/net.cpp +++ b/indra/llmessage/net.cpp @@ -271,8 +271,9 @@ S32 start_net(S32& socket_out, int& nPort) void end_net(S32& socket_out) { - if (socket_out < 0) + if (socket_out >= 0) { + shutdown(socket_out, SD_BOTH); closesocket(socket_out); } WSACleanup(); @@ -443,7 +444,7 @@ S32 start_net(S32& socket_out, int& nPort) void end_net(S32& socket_out) { - if (socket_out < 0) + if (socket_out >= 0) { close(socket_out); } |