aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP
diff options
context:
space:
mode:
authorAdam Frisby2009-05-24 01:36:13 +0000
committerAdam Frisby2009-05-24 01:36:13 +0000
commitac79ff8dc605c6b1cee4316e5648902d123206e7 (patch)
tree2744287a26d94ab1d7e19c9bc8ed9fe158983e57 /OpenSim/Client/MXP
parentThis should make HG asset transfers work much better. It now uses HGUuidGathe... (diff)
downloadopensim-SC_OLD-ac79ff8dc605c6b1cee4316e5648902d123206e7.zip
opensim-SC_OLD-ac79ff8dc605c6b1cee4316e5648902d123206e7.tar.gz
opensim-SC_OLD-ac79ff8dc605c6b1cee4316e5648902d123206e7.tar.bz2
opensim-SC_OLD-ac79ff8dc605c6b1cee4316e5648902d123206e7.tar.xz
* Adds NAT routing support for MXP Asset Delivery. (This means MXP should be fully NAT compatible.)
Diffstat (limited to 'OpenSim/Client/MXP')
-rw-r--r--OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs11
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
450 450
451 joinResponseMessage.RequestMessageId = joinRequestMessage.MessageId; 451 joinResponseMessage.RequestMessageId = joinRequestMessage.MessageId;
452 joinResponseMessage.FailureCode = MxpResponseCodes.SUCCESS; 452 joinResponseMessage.FailureCode = MxpResponseCodes.SUCCESS;
453 453
454 joinResponseMessage.BubbleId = joinRequestMessage.BubbleId; 454 joinResponseMessage.BubbleId = joinRequestMessage.BubbleId;
455 joinResponseMessage.ParticipantId = userId.Guid; 455 joinResponseMessage.ParticipantId = userId.Guid;
456 joinResponseMessage.AvatarId = userId.Guid; 456 joinResponseMessage.AvatarId = userId.Guid;
457 joinResponseMessage.BubbleAssetCacheUrl = "http://"+m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.ExternalHostName+":"+m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.HttpPort+"/assets/"; 457 joinResponseMessage.BubbleAssetCacheUrl = "http://" +
458 NetworkUtil.GetHostFor(session.RemoteEndPoint.Address,
459 m_scenes[
460 new UUID(joinRequestMessage.BubbleId)].
461 RegionInfo.
462 ExternalHostName) + ":" +
463 m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.
464 HttpPort + "/assets/";
458 465
459 joinResponseMessage.BubbleName = m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.RegionName; 466 joinResponseMessage.BubbleName = m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.RegionName;
460 467