aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid
diff options
context:
space:
mode:
authorDiva Canto2010-01-15 15:11:58 -0800
committerDiva Canto2010-01-15 15:11:58 -0800
commitf1c30784ac767bf5f62e81748984b76d85d71f6a (patch)
tree5aa635eadb534f30cd8aa2b9a1803f637e9b95a6 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid
parentAdded a UserAccountCache to the UserAccountServiceConnectors. Uses a CenomeCa... (diff)
downloadopensim-SC_OLD-f1c30784ac767bf5f62e81748984b76d85d71f6a.zip
opensim-SC_OLD-f1c30784ac767bf5f62e81748984b76d85d71f6a.tar.gz
opensim-SC_OLD-f1c30784ac767bf5f62e81748984b76d85d71f6a.tar.bz2
opensim-SC_OLD-f1c30784ac767bf5f62e81748984b76d85d71f6a.tar.xz
* 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/Grid')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs4
1 files changed, 3 insertions, 1 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)