From f1c30784ac767bf5f62e81748984b76d85d71f6a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 15 Jan 2010 15:11:58 -0800
Subject: * General cleanup of Teleports, Crossings and Child agents. They are
 now in the new AgentTransferModule, in line with what MW started implementing
 back in May -- ITeleportModule. This has been renamed IAgentTransferModule,
 to be more generic. * HGSceneCommunicationService has been deleted *
 SceneCommunicationService will likely be deleted soon too

---
 .../ServiceConnectorsOut/Grid/HGGridConnector.cs        |  4 +++-
 .../Simulation/LocalSimulationConnector.cs              | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 592991b..fa705be 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         private static Random random = new Random();
 
-
+        // From the command line link-region
         public GridRegion TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, int xloc, int yloc)
         {
             string host = "127.0.0.1";
@@ -441,6 +441,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0);
         }
 
+        // From the command line and the 2 above
         public bool TryCreateLink(Scene m_scene, IClientAPI client, int xloc, int yloc,
             string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo)
         {
@@ -572,6 +573,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return TryLinkRegion((Scene)client.Scene, client, regionDescriptor);
         }
 
+        // From the map and secondlife://blah
         public GridRegion GetHyperlinkRegion(ulong handle)
         {
             foreach (GridRegion r in m_HyperlinkRegions.Values)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index a341f2f..f4383f1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -43,6 +43,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private List<Scene> m_sceneList = new List<Scene>();
 
+        private IAgentTransferModule m_AgentTransferModule;
+        protected IAgentTransferModule AgentTransferModule
+        {
+            get
+            {
+                if (m_AgentTransferModule == null)
+                    m_AgentTransferModule = m_sceneList[0].RequestModuleInterface<IAgentTransferModule>();
+                return m_AgentTransferModule;
+            }
+        }
+
         private bool m_ModuleEnabled = false;
 
         #region IRegionModule
@@ -247,8 +258,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             {
                 if (s.RegionInfo.RegionID == origin)
                 {
-                    //m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent");
-                    return s.IncomingReleaseAgent(id);
+                    m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent");
+                    AgentTransferModule.AgentArrivedAtDestination(id);
+                    return true;
+//                    return s.IncomingReleaseAgent(id);
                 }
             }
             //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent " + origin);
-- 
cgit v1.1