* Adds NAT routing support for MXP Asset Delivery. (This means MXP should be fully NAT compatible.)

1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
index 2f60810..7eab7c5 100644
--- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
+++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
@@ -450,11 +450,18 @@ namespace OpenSim.Client.MXP.PacketHandler
 
             joinResponseMessage.RequestMessageId = joinRequestMessage.MessageId;
             joinResponseMessage.FailureCode = MxpResponseCodes.SUCCESS;
-
+            
             joinResponseMessage.BubbleId = joinRequestMessage.BubbleId;
             joinResponseMessage.ParticipantId = userId.Guid;
             joinResponseMessage.AvatarId = userId.Guid;
-            joinResponseMessage.BubbleAssetCacheUrl = "http://"+m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.ExternalHostName+":"+m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.HttpPort+"/assets/";
+            joinResponseMessage.BubbleAssetCacheUrl = "http://" +
+                                                      NetworkUtil.GetHostFor(session.RemoteEndPoint.Address,
+                                                                             m_scenes[
+                                                                                 new UUID(joinRequestMessage.BubbleId)].
+                                                                                 RegionInfo.
+                                                                                 ExternalHostName) + ":" +
+                                                      m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.
+                                                          HttpPort + "/assets/";
 
             joinResponseMessage.BubbleName = m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.RegionName;