aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorDiva Canto2010-01-24 16:23:18 -0800
committerDiva Canto2010-01-24 16:23:18 -0800
commit70465f4c9073033b87c781c35172656985fedccc (patch)
treeb1a41447ee22cdfd18f17c200e23bda62799a9ec /OpenSim/Region/ScriptEngine/Shared/Api
parentHypergrid map search back on, this time with a config var in the grid service. (diff)
downloadopensim-SC-70465f4c9073033b87c781c35172656985fedccc.zip
opensim-SC-70465f4c9073033b87c781c35172656985fedccc.tar.gz
opensim-SC-70465f4c9073033b87c781c35172656985fedccc.tar.bz2
opensim-SC-70465f4c9073033b87c781c35172656985fedccc.tar.xz
Removed obsolete interface IHyperlink.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs17
1 files changed, 4 insertions, 13 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7462ba0..b28976e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -607,21 +607,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
607 // and convert the regionName to the target region 607 // and convert the regionName to the target region
608 if (regionName.Contains(".") && regionName.Contains(":")) 608 if (regionName.Contains(".") && regionName.Contains(":"))
609 { 609 {
610 List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
610 // Try to link the region 611 // Try to link the region
611 IHyperlinkService hyperService = World.RequestModuleInterface<IHyperlinkService>(); 612 if (regions != null && regions.Count > 0)
612 if (hyperService != null)
613 { 613 {
614 GridRegion regInfo = hyperService.TryLinkRegion(presence.ControllingClient, 614 GridRegion regInfo = regions[0];
615 regionName); 615 regionName = regInfo.RegionName;
616 // Get the region name
617 if (regInfo != null)
618 {
619 regionName = regInfo.RegionName;
620 }
621 else
622 {
623 // Might need to ping the client here in case of failure??
624 }
625 } 616 }
626 } 617 }
627 presence.ControllingClient.SendTeleportLocationStart(); 618 presence.ControllingClient.SendTeleportLocationStart();