aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService/HypergridLinker.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/GridService/HypergridLinker.cs')
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs62
1 files changed, 0 insertions, 62 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 743d089..7abed20 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -63,7 +63,6 @@ namespace OpenSim.Services.GridService
63 protected GatekeeperServiceConnector m_GatekeeperConnector; 63 protected GatekeeperServiceConnector m_GatekeeperConnector;
64 64
65 protected UUID m_ScopeID = UUID.Zero; 65 protected UUID m_ScopeID = UUID.Zero;
66// protected bool m_Check4096 = true;
67 protected string m_MapTileDirectory = string.Empty; 66 protected string m_MapTileDirectory = string.Empty;
68 protected string m_ThisGatekeeper = string.Empty; 67 protected string m_ThisGatekeeper = string.Empty;
69 protected Uri m_ThisGatekeeperURI = null; 68 protected Uri m_ThisGatekeeperURI = null;
@@ -124,8 +123,6 @@ namespace OpenSim.Services.GridService
124 if (scope != string.Empty) 123 if (scope != string.Empty)
125 UUID.TryParse(scope, out m_ScopeID); 124 UUID.TryParse(scope, out m_ScopeID);
126 125
127// m_Check4096 = gridConfig.GetBoolean("Check4096", true);
128
129 m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); 126 m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
130 127
131 m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty); 128 m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty);
@@ -349,19 +346,6 @@ namespace OpenSim.Services.GridService
349 return true; 346 return true;
350 } 347 }
351 348
352 // We are now performing this check for each individual teleport in the EntityTransferModule instead. This
353 // allows us to give better feedback when teleports fail because of the distance reason (which can't be
354 // done here) and it also hypergrid teleports that are within range (possibly because the source grid
355 // itself has regions that are very far apart).
356// uint x, y;
357// if (m_Check4096 && !Check4096(handle, out x, out y))
358// {
359// //RemoveHyperlinkRegion(regInfo.RegionID);
360// reason = "Region is too far (" + x + ", " + y + ")";
361// m_log.Info("[HYPERGRID LINKER]: Unable to link, region is too far (" + x + ", " + y + ")");
362// //return false;
363// }
364
365 regInfo.RegionID = regionID; 349 regInfo.RegionID = regionID;
366 350
367 if (externalName == string.Empty) 351 if (externalName == string.Empty)
@@ -411,52 +395,6 @@ namespace OpenSim.Services.GridService
411 } 395 }
412 } 396 }
413 397
414// Not currently used
415// /// <summary>
416// /// Cope with this viewer limitation.
417// /// </summary>
418// /// <param name="regInfo"></param>
419// /// <returns></returns>
420// public bool Check4096(ulong realHandle, out uint x, out uint y)
421// {
422// uint ux = 0, uy = 0;
423// Utils.LongToUInts(realHandle, out ux, out uy);
424// x = ux / Constants.RegionSize;
425// y = uy / Constants.RegionSize;
426//
427// const uint limit = (4096 - 1) * Constants.RegionSize;
428// uint xmin = ux - limit;
429// uint xmax = ux + limit;
430// uint ymin = uy - limit;
431// uint ymax = uy + limit;
432// // World map boundary checks
433// if (xmin < 0 || xmin > ux)
434// xmin = 0;
435// if (xmax > int.MaxValue || xmax < ux)
436// xmax = int.MaxValue;
437// if (ymin < 0 || ymin > uy)
438// ymin = 0;
439// if (ymax > int.MaxValue || ymax < uy)
440// ymax = int.MaxValue;
441//
442// // Check for any regions that are within the possible teleport range to the linked region
443// List<GridRegion> regions = m_GridService.GetRegionRange(m_ScopeID, (int)xmin, (int)xmax, (int)ymin, (int)ymax);
444// if (regions.Count == 0)
445// {
446// return false;
447// }
448// else
449// {
450// // Check for regions which are not linked regions
451// List<GridRegion> hyperlinks = m_GridService.GetHyperlinks(m_ScopeID);
452// IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
453// if (availableRegions.Count() == 0)
454// return false;
455// }
456//
457// return true;
458// }
459
460 private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle) 398 private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle)
461 { 399 {
462 RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo); 400 RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo);