aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2015-08-01 09:30:34 -0700
committerDiva Canto2015-08-01 09:30:34 -0700
commit32d87aa168bf89996a8741b8d67c92afd1bb2531 (patch)
tree5eb1c38ad98fe32a8e4b80af6460f312c3ddc3a2
parentShow last online status of group members from the PresenceService in group pr... (diff)
downloadopensim-SC-32d87aa168bf89996a8741b8d67c92afd1bb2531.zip
opensim-SC-32d87aa168bf89996a8741b8d67c92afd1bb2531.tar.gz
opensim-SC-32d87aa168bf89996a8741b8d67c92afd1bb2531.tar.bz2
opensim-SC-32d87aa168bf89996a8741b8d67c92afd1bb2531.tar.xz
Mantis #7664: Added IHypergridLinker interface to establish a contract about what implementers need to provide publicly. This is used by 3rd-party addons such as Wifi.
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs4
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs6
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index a774303..9d016fc 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -47,7 +47,7 @@ using OpenMetaverse;
47 47
48namespace OpenSim.Services.GridService 48namespace OpenSim.Services.GridService
49{ 49{
50 public class HypergridLinker 50 public class HypergridLinker : IHypergridLinker
51 { 51 {
52 private static readonly ILog m_log = 52 private static readonly ILog m_log =
53 LogManager.GetLogger( 53 LogManager.GetLogger(
@@ -191,7 +191,7 @@ namespace OpenSim.Services.GridService
191 return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason); 191 return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason);
192 } 192 }
193 193
194 private GridRegion TryLinkRegionToCoords(UUID scopeID, string mapName, int xloc, int yloc, UUID ownerID, out string reason) 194 public GridRegion TryLinkRegionToCoords(UUID scopeID, string mapName, int xloc, int yloc, UUID ownerID, out string reason)
195 { 195 {
196 reason = string.Empty; 196 reason = string.Empty;
197 GridRegion regInfo = null; 197 GridRegion regInfo = null;
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 0b318b3..f5f1f75 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -124,6 +124,12 @@ namespace OpenSim.Services.Interfaces
124 Dictionary<string,object> GetExtraFeatures(); 124 Dictionary<string,object> GetExtraFeatures();
125 } 125 }
126 126
127 public interface IHypergridLinker
128 {
129 GridRegion TryLinkRegionToCoords(UUID scopeID, string mapName, int xloc, int yloc, UUID ownerID, out string reason);
130 bool TryUnlinkRegion(string mapName);
131 }
132
127 public class GridRegion 133 public class GridRegion
128 { 134 {
129// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 135// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);