3 files changed, 6 insertions, 4 deletions

diff --git a/linden/indra/llmessage/llteleportflags.h b/linden/indra/llmessage/llteleportflags.h
index 25aac14..60916bd 100644
--- a/linden/indra/llmessage/llteleportflags.h
+++ b/linden/indra/llmessage/llteleportflags.h
@@ -44,6 +44,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/linden/indra/llmessage/machine.h b/linden/indra/llmessage/machine.h
index 490ddc5..b28e621 100644
--- a/linden/indra/llmessage/machine.h
+++ b/linden/indra/llmessage/machine.h
@@ -62,8 +62,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/linden/indra/llmessage/net.cpp b/linden/indra/llmessage/net.cpp
index 1395093..92efd15 100644
--- a/linden/indra/llmessage/net.cpp
+++ b/linden/indra/llmessage/net.cpp
@@ -291,8 +291,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();
@@ -463,7 +464,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);
         }