From a56a17fab20e1ef94e70dbf6648ebb2f437de364 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 9 Aug 2007 12:59:42 +0000
Subject: Making sure my local working copy is in sync with svn before I start
 the job of enabling the new SceneObject classes.

---
 OpenSim/Region/Environment/Scenes/Scene.cs         | 11 +++++++++--
 OpenSim/Region/Environment/Scenes/ScenePresence.cs |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 19fd075..813308b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -75,6 +75,10 @@ namespace OpenSim.Region.Environment.Scenes
 
         #region Properties
 
+        public AgentCircuitManager AuthenticateHandler
+        {
+            get { return this.authenticateHandler; }
+        }
         /// <summary>
         /// 
         /// </summary>
@@ -600,7 +604,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
             
-          // client.OnCreateNewInventoryItem += CreateNewInventoryItem;
+           //client.OnCreateNewInventoryItem += CreateNewInventoryItem;
             //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder;
             client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents;
             client.OnRequestTaskInventory += RequestTaskInventory;
@@ -922,7 +926,10 @@ namespace OpenSim.Region.Environment.Scenes
                     commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
                     commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false);
 
-                    remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4));
+                    //TODO: following line is hard coded to port 9000, really need to change this as soon as possible
+                    AgentCircuitData circuitdata = remoteClient.RequestClientInfo();
+                    string capsPath = "http://" + reg.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" + this.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/";
+                    remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath);
                 }
             }
         }
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
                 bool res = this.m_scene.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos, this._physActor.Flying);
                 if (res)
                 {
-                    this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint);
+                    //TODO: following line is hard coded to port 9000, really need to change this as soon as possible
+                    AgentCircuitData circuitdata = this.ControllingClient.RequestClientInfo();
+                    string capsPath = "http://" + neighbourRegion.ExternalEndPoint.Address.ToString() + ":9000/CAPS/" +this.m_scene.AuthenticateHandler.AgentCircuits[circuitdata.circuitcode].CapsPath + "0000/";
+                    this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath);
                     this.MakeChildAgent();
                 }
             }
-- 
cgit v1.1