diff options
Temporary fix for the region crossing crash, Although we need to start to change and improve how we handle caps.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 1be1e7a..6e4fcda 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -34,6 +34,7 @@ using libsecondlife.Packets; | |||
34 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
35 | using OpenSim.Framework.Interfaces; | 35 | using OpenSim.Framework.Interfaces; |
36 | using OpenSim.Framework.Types; | 36 | using OpenSim.Framework.Types; |
37 | using OpenSim.Framework.Utilities; | ||
37 | using OpenSim.Physics.Manager; | 38 | using OpenSim.Physics.Manager; |
38 | 39 | ||
39 | namespace OpenSim.Region.Environment.Scenes | 40 | namespace OpenSim.Region.Environment.Scenes |
@@ -623,7 +624,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
623 | { | 624 | { |
624 | //TODO: following line is hard coded to port 9000, really need to change this as soon as possible | 625 | //TODO: following line is hard coded to port 9000, really need to change this as soon as possible |
625 | AgentCircuitData circuitdata = this.ControllingClient.RequestClientInfo(); | 626 | AgentCircuitData circuitdata = this.ControllingClient.RequestClientInfo(); |
626 | string capsPath = "http://" + neighbourRegion.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" +this.m_scene.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/"; | 627 | string capsPath = Util.GetCapsURL(this.ControllingClient.AgentId); |
627 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath); | 628 | this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath); |
628 | this.MakeChildAgent(); | 629 | this.MakeChildAgent(); |
629 | } | 630 | } |