aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDahlia Trimble2009-04-22 17:09:56 +0000
committerDahlia Trimble2009-04-22 17:09:56 +0000
commitd2bf957b13ba241573df3770d39b886ad48f3760 (patch)
tree6f3b3649b0f77db91deabe311100be9ecabfb331
parentThank you kindly, Marcus Llewellyn, for a patch that: (diff)
downloadopensim-SC_OLD-d2bf957b13ba241573df3770d39b886ad48f3760.zip
opensim-SC_OLD-d2bf957b13ba241573df3770d39b886ad48f3760.tar.gz
opensim-SC_OLD-d2bf957b13ba241573df3770d39b886ad48f3760.tar.bz2
opensim-SC_OLD-d2bf957b13ba241573df3770d39b886ad48f3760.tar.xz
Thanks tlaukkan for a patch that Fixes asset cache url forming for MXP join response message. Addresses Mantis #3505
-rw-r--r--OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
index c757a32..3333bbf 100644
--- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
+++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
@@ -437,7 +437,7 @@ namespace OpenSim.Client.MXP.PacketHandler
437 joinResponseMessage.BubbleId = joinRequestMessage.BubbleId; 437 joinResponseMessage.BubbleId = joinRequestMessage.BubbleId;
438 joinResponseMessage.ParticipantId = userId.Guid; 438 joinResponseMessage.ParticipantId = userId.Guid;
439 joinResponseMessage.AvatarId = userId.Guid; 439 joinResponseMessage.AvatarId = userId.Guid;
440 joinResponseMessage.BubbleAssetCacheUrl = m_scenes[new UUID(joinRequestMessage.BubbleId)].CommsManager.NetworkServersInfo.AssetURL; 440 joinResponseMessage.BubbleAssetCacheUrl = "http://"+m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.ExternalHostName+":"+m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.HttpPort+"/assets/";
441 441
442 joinResponseMessage.BubbleName = m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.RegionName; 442 joinResponseMessage.BubbleName = m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.RegionName;
443 443