diff options
* 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
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 17 |
1 files changed, 15 insertions, 2 deletions
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); |