diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index d5406b6..dbf385d 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -656,7 +656,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
656 | if (agent.CapsPath != "") | 656 | if (agent.CapsPath != "") |
657 | { | 657 | { |
658 | //Console.WriteLine("new user, so creating caps handler for it"); | 658 | //Console.WriteLine("new user, so creating caps handler for it"); |
659 | Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID); | 659 | Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.ExternalHostName, this.m_regInfo.ExternalEndPoint.Port, agent.CapsPath, agent.AgentID); |
660 | cap.RegisterHandlers(); | 660 | cap.RegisterHandlers(); |
661 | this.capsHandlers.Add(agent.AgentID, cap); | 661 | this.capsHandlers.Add(agent.AgentID, cap); |
662 | } | 662 | } |
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
695 | agent.startpos = new LLVector3(128, 128, 70); | 695 | agent.startpos = new LLVector3(128, 128, 70); |
696 | agent.child = true; | 696 | agent.child = true; |
697 | this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent); | 697 | this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent); |
698 | remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr), (ushort)neighbours[i].CommsIPListenPort); | 698 | remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint ); |
699 | //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort); | 699 | //this.capsHandlers[remoteClient.AgentId].CreateEstablishAgentComms("", System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr) + ":" + neighbours[i].CommsIPListenPort); |
700 | } | 700 | } |
701 | } | 701 | } |
@@ -757,7 +757,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
757 | agent.child = true; | 757 | agent.child = true; |
758 | this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); | 758 | this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); |
759 | this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position); | 759 | this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position); |
760 | remoteClient.SendRegionTeleport(regionHandle, 13, reg.CommsIPListenAddr, (ushort)reg.CommsIPListenPort, 4, (1 << 4)); | 760 | remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4)); |
761 | } | 761 | } |
762 | //remoteClient.SendTeleportCancel(); | 762 | //remoteClient.SendTeleportCancel(); |
763 | } | 763 | } |