3 files changed, 6 insertions, 4 deletions
diff --git a/indra/llmessage/llteleportflags.h b/indra/llmessage/llteleportflags.h
index 001d05d109..fd54814ce5 100644
--- a/indra/llmessage/llteleportflags.h
+++ b/indra/llmessage/llteleportflags.h
@@ -24,6 +24,7 @@ const U32 TELEPORT_FLAGS_911 				= 1 << 10;
 const U32 TELEPORT_FLAGS_DISABLE_CANCEL		= 1 << 11;	// Used for llTeleportAgentHome()
 const U32 TELEPORT_FLAGS_VIA_REGION_ID  	= 1 << 12;
 const U32 TELEPORT_FLAGS_IS_FLYING			= 1 << 13;
+const U32 TELEPORT_FLAGS_SHOW_RESET_HOME	= 1 << 14;
 
 const U32 TELEPORT_FLAGS_MASK_VIA =   TELEPORT_FLAGS_VIA_LURE 
 									| TELEPORT_FLAGS_VIA_LANDMARK
diff --git a/indra/llmessage/machine.h b/indra/llmessage/machine.h
index b5efe717d8..55e3aa0b3c 100644
--- a/indra/llmessage/machine.h
+++ b/indra/llmessage/machine.h
@@ -42,8 +42,8 @@ public:
 
 	// get functions
 	EMachineType	getMachineType()	const { return mMachineType; }
-	const U32		getMachineIP()		const { return mHost.getAddress(); }
-	const S32		getMachinePort()	const { return mHost.getPort(); }
+	U32				getMachineIP()		const { return mHost.getAddress(); }
+	S32				getMachinePort()	const { return mHost.getPort(); }
 	const LLHost	&getMachineHost()	const { return mHost; }
 	// The control port is the listen port of the parent process that
 	// launched this machine. 0 means none or not known.
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);
 	}