From 92921d15005dd497fc1703f88f9db766469c7a5a Mon Sep 17 00:00:00 2001 From: Robert Knop Date: Mon, 19 Jan 2009 23:03:47 +0000 Subject: svn merge -r108243:108266 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 no conflicts --- indra/llmessage/net.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llmessage') diff --git a/indra/llmessage/net.cpp b/indra/llmessage/net.cpp index 94a0feb6a7..8cbd9f63f1 100644 --- a/indra/llmessage/net.cpp +++ b/indra/llmessage/net.cpp @@ -71,7 +71,6 @@ static WSADATA stWSAData; struct sockaddr_in stDstAddr; struct sockaddr_in stSrcAddr; struct sockaddr_in stLclAddr; -static U32 gsnReceivingIFAddr = INVALID_HOST_IP_ADDRESS; // Address to which datagram was sent #if LL_DARWIN #ifndef _SOCKLEN_T @@ -82,6 +81,7 @@ typedef int socklen_t; #endif +static U32 gsnReceivingIFAddr = INVALID_HOST_IP_ADDRESS; // Address to which datagram was sent const char* LOOPBACK_ADDRESS_STRING = "127.0.0.1"; -- cgit v1.2.3