diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 17c1b3a..b021b44 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
| @@ -620,7 +620,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 620 | bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying); | 620 | bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying); |
| 621 | if (res) | 621 | if (res) |
| 622 | { | 622 | { |
| 623 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint); | 623 | //TODO: following line is hard coded to port 9000, really need to change this as soon as possible |
| 624 | AgentCircuitData circuitdata = this.ControllingClient.RequestClientInfo(); | ||
| 625 | string capsPath = "http://" + neighbourRegion.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" +this.m_scene.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/"; | ||
| 626 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath); | ||
| 624 | this.MakeChildAgent(); | 627 | this.MakeChildAgent(); |
| 625 | } | 628 | } |
| 626 | } | 629 | } |