diff options
author | Diva Canto | 2010-01-17 11:33:47 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-17 11:33:47 -0800 |
commit | f276ba57bf5bd732fbc6a255213c9bb7f5f5f148 (patch) | |
tree | 65c49c571c4012b195a309866b8bf6ed2885f9ef /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | Copyright notices. (diff) | |
download | opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.zip opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.tar.gz opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.tar.bz2 opensim-SC_OLD-f276ba57bf5bd732fbc6a255213c9bb7f5f5f148.tar.xz |
HG agent transfers are starting to work. Gatekeeper handlers are missing.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 773286c..07f3cdc 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
@@ -48,7 +48,7 @@ using Nini.Config; | |||
48 | 48 | ||
49 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | 49 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid |
50 | { | 50 | { |
51 | public class HGGridConnector : ISharedRegionModule, IGridService | 51 | public class HGGridConnector : ISharedRegionModule, IGridService, IHypergridService |
52 | { | 52 | { |
53 | private static readonly ILog m_log = | 53 | private static readonly ILog m_log = |
54 | LogManager.GetLogger( | 54 | LogManager.GetLogger( |
@@ -148,6 +148,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
148 | 148 | ||
149 | m_LocalScenes[scene.RegionInfo.RegionHandle] = scene; | 149 | m_LocalScenes[scene.RegionInfo.RegionHandle] = scene; |
150 | scene.RegisterModuleInterface<IGridService>(this); | 150 | scene.RegisterModuleInterface<IGridService>(this); |
151 | scene.RegisterModuleInterface<IHypergridService>(this); | ||
151 | 152 | ||
152 | ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene); | 153 | ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene); |
153 | 154 | ||
@@ -158,6 +159,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
158 | if (m_Enabled) | 159 | if (m_Enabled) |
159 | { | 160 | { |
160 | m_LocalScenes.Remove(scene.RegionInfo.RegionHandle); | 161 | m_LocalScenes.Remove(scene.RegionInfo.RegionHandle); |
162 | scene.UnregisterModuleInterface<IGridService>(this); | ||
163 | scene.UnregisterModuleInterface<IHypergridService>(this); | ||
161 | ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene); | 164 | ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene); |
162 | } | 165 | } |
163 | } | 166 | } |
@@ -278,5 +281,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
278 | 281 | ||
279 | #endregion | 282 | #endregion |
280 | 283 | ||
284 | #region IHypergridService | ||
285 | |||
286 | public bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason) | ||
287 | { | ||
288 | return m_HypergridService.LinkRegion(regionDescriptor, out regionID, out regionHandle, out imageURL, out reason); | ||
289 | } | ||
290 | |||
291 | public GridRegion GetHyperlinkRegion(GridRegion gateway, UUID regionID) | ||
292 | { | ||
293 | if (m_LocalScenes.ContainsKey(gateway.RegionHandle)) | ||
294 | return gateway; | ||
295 | |||
296 | return m_HypergridService.GetHyperlinkRegion(gateway, regionID); | ||
297 | } | ||
298 | |||
299 | public GridRegion GetRegionByUUID(UUID regionID) { return null; } | ||
300 | public GridRegion GetRegionByPosition(int x, int y) { return null; } | ||
301 | public GridRegion GetRegionByName(string name) { return null; } | ||
302 | public List<GridRegion> GetRegionsByName(string name) { return null; } | ||
303 | public List<GridRegion> GetRegionRange(int xmin, int xmax, int ymin, int ymax) { return null; } | ||
304 | |||
305 | #endregion | ||
281 | } | 306 | } |
282 | } | 307 | } |