Removed obsolete interface IHyperlink.

3 files changed, 4 insertions, 37 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 227c37f..24b5d6c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -58,8 +58,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         protected LocalSimulationConnectorModule m_localBackend;
         protected SimulationServiceConnector m_remoteConnector;
 
-        protected IHyperlinkService m_hyperlinkService;
-
         protected bool m_safemode;
         protected IPAddress m_thisIP;
 
@@ -124,9 +122,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         {
             if (!m_enabled)
                 return;
-
-            m_hyperlinkService = m_aScene.RequestModuleInterface<IHyperlinkService>();
-
         }
 
         public Type ReplaceableInterface
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 42b4632..56200ec 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -104,25 +104,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if (info != null) regionInfos.Add(info);
             }
 
-            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
-                if (mapName.Contains("."))
-                {
-                    // It probably is a domain name. Try to link to it.
-                    GridRegion regInfo;
-                    Scene cScene = GetClientScene(remoteClient);
-                    IHyperlinkService hyperService = cScene.RequestModuleInterface<IHyperlinkService>();
-                    if (hyperService != null)
-                    {
-                        regInfo = hyperService.TryLinkRegion(remoteClient, mapName);
-                        if (regInfo != null)
-                            regionInfos.Add(regInfo);
-                    }
-                }
-            }
-
             List<MapBlockData> blocks = new List<MapBlockData>();
 
             MapBlockData data;
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
                         // and convert the regionName to the target region
                         if (regionName.Contains(".") && regionName.Contains(":"))
                         {
+                            List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
                             // Try to link the region
-                            IHyperlinkService hyperService = World.RequestModuleInterface<IHyperlinkService>();
-                            if (hyperService != null)
+                            if (regions != null && regions.Count > 0)
                             {
-                                GridRegion regInfo = hyperService.TryLinkRegion(presence.ControllingClient,
-                                                                                regionName);
-                                // Get the region name
-                                if (regInfo != null)
-                                {
-                                    regionName = regInfo.RegionName;
-                                }
-                                else
-                                {
-                                    // Might need to ping the client here in case of failure??
-                                }
+                                GridRegion regInfo = regions[0];
+                                regionName = regInfo.RegionName;
                             }
                         }
                         presence.ControllingClient.SendTeleportLocationStart();