aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-24 15:04:41 -0800
committerDiva Canto2010-01-24 15:04:41 -0800
commitea3d287f70d48eb2d3abf6eb1506bf64674874c5 (patch)
tree6b18f49a8bc9994ea615ac0dd890adb55cd68ec1
parentIntegrated the hyperlinking with the GridService. (diff)
downloadopensim-SC_OLD-ea3d287f70d48eb2d3abf6eb1506bf64674874c5.zip
opensim-SC_OLD-ea3d287f70d48eb2d3abf6eb1506bf64674874c5.tar.gz
opensim-SC_OLD-ea3d287f70d48eb2d3abf6eb1506bf64674874c5.tar.bz2
opensim-SC_OLD-ea3d287f70d48eb2d3abf6eb1506bf64674874c5.tar.xz
Some method implementations were missing from LocalGridServiceConnector.
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs30
-rw-r--r--OpenSim/Services/GridService/GridService.cs4
3 files changed, 20 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index e237ca2..a1de57a 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -124,8 +124,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
124 protected override GridRegion GetFinalDestination(GridRegion region) 124 protected override GridRegion GetFinalDestination(GridRegion region)
125 { 125 {
126 int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, region.RegionID); 126 int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, region.RegionID);
127 //m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: region {0} flags: {1}", region.RegionID, flags);
127 if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0) 128 if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
128 { 129 {
130 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID);
129 return m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID); 131 return m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
130 } 132 }
131 return region; 133 return region;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 86a8c13..1b00c8a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -238,6 +238,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
238 return m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax); 238 return m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax);
239 } 239 }
240 240
241 public List<GridRegion> GetDefaultRegions(UUID scopeID)
242 {
243 return m_GridService.GetDefaultRegions(scopeID);
244 }
245
246 public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
247 {
248 return m_GridService.GetFallbackRegions(scopeID, x, y);
249 }
250
251 public int GetRegionFlags(UUID scopeID, UUID regionID)
252 {
253 return m_GridService.GetRegionFlags(scopeID, regionID);
254 }
255
241 #endregion 256 #endregion
242 257
243 public void NeighboursCommand(string module, string[] cmdparams) 258 public void NeighboursCommand(string module, string[] cmdparams)
@@ -251,20 +266,5 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
251 } 266 }
252 } 267 }
253 268
254 public List<GridRegion> GetDefaultRegions(UUID scopeID)
255 {
256 return null;
257 }
258
259 public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
260 {
261 return null;
262 }
263
264 public int GetRegionFlags(UUID scopeID, UUID regionID)
265 {
266 return 0;
267 }
268
269 } 269 }
270} 270}
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index ae29a74..b86fd4d 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -410,7 +410,9 @@ namespace OpenSim.Services.GridService
410 { 410 {
411 RegionData region = m_Database.Get(regionID, scopeID); 411 RegionData region = m_Database.Get(regionID, scopeID);
412 412
413 return Convert.ToInt32(region.Data["flags"]); 413 int flags = Convert.ToInt32(region.Data["flags"]);
414 //m_log.DebugFormat("[GRID SERVICE]: Request for flags of {0}: {1}", regionID, flags);
415 return flags;
414 } 416 }
415 417
416 private void HandleShowRegion(string module, string[] cmd) 418 private void HandleShowRegion(string module, string[] cmd)