diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 17 |
2 files changed, 18 insertions, 3 deletions
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 | |||
385 | 385 | ||
386 | private static Random random = new Random(); | 386 | private static Random random = new Random(); |
387 | 387 | ||
388 | 388 | // From the command line link-region | |
389 | public GridRegion TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, int xloc, int yloc) | 389 | public GridRegion TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, int xloc, int yloc) |
390 | { | 390 | { |
391 | string host = "127.0.0.1"; | 391 | string host = "127.0.0.1"; |
@@ -441,6 +441,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
441 | return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0); | 441 | return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0); |
442 | } | 442 | } |
443 | 443 | ||
444 | // From the command line and the 2 above | ||
444 | public bool TryCreateLink(Scene m_scene, IClientAPI client, int xloc, int yloc, | 445 | public bool TryCreateLink(Scene m_scene, IClientAPI client, int xloc, int yloc, |
445 | string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo) | 446 | string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo) |
446 | { | 447 | { |
@@ -572,6 +573,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
572 | return TryLinkRegion((Scene)client.Scene, client, regionDescriptor); | 573 | return TryLinkRegion((Scene)client.Scene, client, regionDescriptor); |
573 | } | 574 | } |
574 | 575 | ||
576 | // From the map and secondlife://blah | ||
575 | public GridRegion GetHyperlinkRegion(ulong handle) | 577 | public GridRegion GetHyperlinkRegion(ulong handle) |
576 | { | 578 | { |
577 | foreach (GridRegion r in m_HyperlinkRegions.Values) | 579 | 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 | |||
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | private List<Scene> m_sceneList = new List<Scene>(); | 44 | private List<Scene> m_sceneList = new List<Scene>(); |
45 | 45 | ||
46 | private IAgentTransferModule m_AgentTransferModule; | ||
47 | protected IAgentTransferModule AgentTransferModule | ||
48 | { | ||
49 | get | ||
50 | { | ||
51 | if (m_AgentTransferModule == null) | ||
52 | m_AgentTransferModule = m_sceneList[0].RequestModuleInterface<IAgentTransferModule>(); | ||
53 | return m_AgentTransferModule; | ||
54 | } | ||
55 | } | ||
56 | |||
46 | private bool m_ModuleEnabled = false; | 57 | private bool m_ModuleEnabled = false; |
47 | 58 | ||
48 | #region IRegionModule | 59 | #region IRegionModule |
@@ -247,8 +258,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
247 | { | 258 | { |
248 | if (s.RegionInfo.RegionID == origin) | 259 | if (s.RegionInfo.RegionID == origin) |
249 | { | 260 | { |
250 | //m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent"); | 261 | m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent"); |
251 | return s.IncomingReleaseAgent(id); | 262 | AgentTransferModule.AgentArrivedAtDestination(id); |
263 | return true; | ||
264 | // return s.IncomingReleaseAgent(id); | ||
252 | } | 265 | } |
253 | } | 266 | } |
254 | //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent " + origin); | 267 | //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent " + origin); |