diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
| commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
| tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/llmessage/net.h | |
| parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) | |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/llmessage/net.h')
| -rw-r--r-- | indra/llmessage/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/net.h b/indra/llmessage/net.h index 1044807ba6..c544325dd2 100644 --- a/indra/llmessage/net.h +++ b/indra/llmessage/net.h @@ -20,7 +20,7 @@ class LLHost; // Returns 0 on success, non-zero on error. // Sets socket handler/descriptor, changes nPort if port requested is unavailable. S32 start_net(S32& socket_out, int& nPort); -void end_net(); +void end_net(S32& socket_out); // returns size of packet or -1 in case of error S32 receive_packet(int hSocket, char * receiveBuffer); |