aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMW2007-08-15 15:24:37 +0000
committerMW2007-08-15 15:24:37 +0000
commit217d511077cba75e48957bcbb0a0da8344fa8f4c (patch)
treec099e819170af74e59c79889a94f5effb8074405 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parent* Permissions! - You can now only perform certain functions (such as editing ... (diff)
downloadopensim-SC_OLD-217d511077cba75e48957bcbb0a0da8344fa8f4c.zip
opensim-SC_OLD-217d511077cba75e48957bcbb0a0da8344fa8f4c.tar.gz
opensim-SC_OLD-217d511077cba75e48957bcbb0a0da8344fa8f4c.tar.bz2
opensim-SC_OLD-217d511077cba75e48957bcbb0a0da8344fa8f4c.tar.xz
Temporary fix for the region crossing crash, Although we need to start to change and improve how we handle caps.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
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;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Utilities;
37using OpenSim.Physics.Manager; 38using OpenSim.Physics.Manager;
38 39
39namespace OpenSim.Region.Environment.Scenes 40namespace 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 }