From 70465f4c9073033b87c781c35172656985fedccc Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 24 Jan 2010 16:23:18 -0800 Subject: Removed obsolete interface IHyperlink. --- .../Simulation/RemoteSimulationConnector.cs | 5 --- .../CoreModules/World/WorldMap/MapSearchModule.cs | 19 --------- .../Shared/Api/Implementation/OSSL_Api.cs | 17 ++------ OpenSim/Services/Interfaces/IHyperlink.cs | 49 ---------------------- 4 files changed, 4 insertions(+), 86 deletions(-) delete mode 100644 OpenSim/Services/Interfaces/IHyperlink.cs 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(); - } 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(); - if (hyperService != null) - { - regInfo = hyperService.TryLinkRegion(remoteClient, mapName); - if (regInfo != null) - regionInfos.Add(regInfo); - } - } - } - List blocks = new List(); 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 regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); // Try to link the region - IHyperlinkService hyperService = World.RequestModuleInterface(); - 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(); diff --git a/OpenSim/Services/Interfaces/IHyperlink.cs b/OpenSim/Services/Interfaces/IHyperlink.cs deleted file mode 100644 index ed3ff23..0000000 --- a/OpenSim/Services/Interfaces/IHyperlink.cs +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using OpenSim.Framework; -using GridRegion = OpenSim.Services.Interfaces.GridRegion; - -using OpenMetaverse; - -namespace OpenSim.Services.Interfaces -{ - public interface IHyperlinkService - { - GridRegion TryLinkRegion(IClientAPI client, string regionDescriptor); - GridRegion GetHyperlinkRegion(ulong handle); - ulong FindRegionHandle(ulong handle); - - bool SendUserInformation(GridRegion region, AgentCircuitData aCircuit); - void AdjustUserInformation(AgentCircuitData aCircuit); - - bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome); - void AcceptUser(ForeignUserProfileData user, GridRegion home); - - bool IsLocalUser(UUID userID); - } -} -- cgit v1.1