From e03bb0606a10f29c8b94909a713a5bb5c69e88b7 Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Thu, 21 Jun 2007 22:40:22 +0000 Subject: merge -r62831:64079 branches/maintenance to release --- indra/llmessage/net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llmessage/net.h') 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); -- cgit v1.2.3