From 4ecb9cb63e4993b3b4bc65d73ed255139b5c3f75 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Tue, 1 May 2007 21:39:25 +0000
Subject: svn merge -r 59163:61099
 svn+ssh://svn/svn/linden/branches/release-candidate into release

---
 indra/llmessage/net.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llmessage/net.cpp')

diff --git a/indra/llmessage/net.cpp b/indra/llmessage/net.cpp
index a78b216ccb..9e83ce1434 100644
--- a/indra/llmessage/net.cpp
+++ b/indra/llmessage/net.cpp
@@ -222,6 +222,12 @@ S32 start_net(S32& socket_out, int& nPort)
 			return 4;
 		}
 	}
+
+	sockaddr_in socket_address;
+	S32 socket_address_size = sizeof(socket_address);
+	getsockname(hSocket, (SOCKADDR*) &socket_address, &socket_address_size);
+	attempt_port = ntohs(socket_address.sin_port);
+
 	llinfos << "connected on port " << attempt_port << llendl;
 	nPort = attempt_port;
 	
-- 
cgit v1.2.3