aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
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/CoreModules
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/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs19
2 files changed, 0 insertions, 24 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;