ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

* 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.

Browse Source 
* HGSceneCommunicationService has been deleted
* SceneCommunicationService will likely be deleted soon too
This commit is contained in:
Diva Canto
2010-01-15 15:11:58 -08:00
parent e9d376972f
commit f1c30784ac
17 changed files with 1266 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1188
OpenSim/Region/CoreModules/Agent/AgentTransfer/AgentTransferModule.cs Normal file
View File

File diff suppressed because it is too large Load Diff

1
OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
View File

@@ -8,6 +8,7 @@
</Dependencies>
<Extension path = "/OpenSim/RegionModules">
<RegionModule id="AgentTransferModule" type="OpenSim.Region.CoreModules.Agent.AgentTransfer.AgentTransferModule" />
<RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" />
<RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" />
<RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" />

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
View File

@@ -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)

17
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
View File

@@ -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);

7
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
View File

@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
if (info != null) regionInfos.Add(info);
}
if ((regionInfos.Count == 0) && IsHypergridOn())
if ((regionInfos.Count == 0))
{
// OK, we tried but there are no regions matching that name.
// Let's check quickly if this is a domain name, and if so link to it
@@ -158,11 +158,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
remoteClient.SendMapBlock(blocks, 0);
}
private bool IsHypergridOn()
{
return (m_scene.SceneGridService is HGSceneCommunicationService);
}
private Scene GetClientScene(IClientAPI client)
{
foreach (Scene s in m_scenes)