aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs19
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs17
-rw-r--r--OpenSim/Services/Interfaces/IHyperlink.cs49
4 files changed, 4 insertions, 86 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
58 protected LocalSimulationConnectorModule m_localBackend; 58 protected LocalSimulationConnectorModule m_localBackend;
59 protected SimulationServiceConnector m_remoteConnector; 59 protected SimulationServiceConnector m_remoteConnector;
60 60
61 protected IHyperlinkService m_hyperlinkService;
62
63 protected bool m_safemode; 61 protected bool m_safemode;
64 protected IPAddress m_thisIP; 62 protected IPAddress m_thisIP;
65 63
@@ -124,9 +122,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
124 { 122 {
125 if (!m_enabled) 123 if (!m_enabled)
126 return; 124 return;
127
128 m_hyperlinkService = m_aScene.RequestModuleInterface<IHyperlinkService>();
129
130 } 125 }
131 126
132 public Type ReplaceableInterface 127 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
104 if (info != null) regionInfos.Add(info); 104 if (info != null) regionInfos.Add(info);
105 } 105 }
106 106
107 if ((regionInfos.Count == 0))
108 {
109 // OK, we tried but there are no regions matching that name.
110 // Let's check quickly if this is a domain name, and if so link to it
111 if (mapName.Contains("."))
112 {
113 // It probably is a domain name. Try to link to it.
114 GridRegion regInfo;
115 Scene cScene = GetClientScene(remoteClient);
116 IHyperlinkService hyperService = cScene.RequestModuleInterface<IHyperlinkService>();
117 if (hyperService != null)
118 {
119 regInfo = hyperService.TryLinkRegion(remoteClient, mapName);
120 if (regInfo != null)
121 regionInfos.Add(regInfo);
122 }
123 }
124 }
125
126 List<MapBlockData> blocks = new List<MapBlockData>(); 107 List<MapBlockData> blocks = new List<MapBlockData>();
127 108
128 MapBlockData data; 109 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
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();
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 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using OpenSim.Framework;
29using GridRegion = OpenSim.Services.Interfaces.GridRegion;
30
31using OpenMetaverse;
32
33namespace OpenSim.Services.Interfaces
34{
35 public interface IHyperlinkService
36 {
37 GridRegion TryLinkRegion(IClientAPI client, string regionDescriptor);
38 GridRegion GetHyperlinkRegion(ulong handle);
39 ulong FindRegionHandle(ulong handle);
40
41 bool SendUserInformation(GridRegion region, AgentCircuitData aCircuit);
42 void AdjustUserInformation(AgentCircuitData aCircuit);
43
44 bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome);
45 void AcceptUser(ForeignUserProfileData user, GridRegion home);
46
47 bool IsLocalUser(UUID userID);
48 }
49}