aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-12-16 21:15:21 +0000
committerUbitUmarov2016-12-16 21:15:21 +0000
commitaa9a56d4df25c073c504575eee2dafcb3d08f6d1 (patch)
treeff291ec8238f1d4fc56d5d9357ee4541df42d100
parentand yes HG uri again (diff)
downloadopensim-SC-aa9a56d4df25c073c504575eee2dafcb3d08f6d1.zip
opensim-SC-aa9a56d4df25c073c504575eee2dafcb3d08f6d1.tar.gz
opensim-SC-aa9a56d4df25c073c504575eee2dafcb3d08f6d1.tar.bz2
opensim-SC-aa9a56d4df25c073c504575eee2dafcb3d08f6d1.tar.xz
dont allow regions to be register on map area reserved for HG links
-rw-r--r--OpenSim/Services/GridService/GridService.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index c5419d5..aa13a67 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -197,6 +197,9 @@ namespace OpenSim.Services.GridService
197 if (regionInfos.RegionID == UUID.Zero) 197 if (regionInfos.RegionID == UUID.Zero)
198 return "Invalid RegionID - cannot be zero UUID"; 198 return "Invalid RegionID - cannot be zero UUID";
199 199
200 if (regionInfos.RegionLocY <= Constants.MaximumRegionSize)
201 return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString();
202
200 String reason = "Region overlaps another region"; 203 String reason = "Region overlaps another region";
201 204
202 List<RegionData> rdatas = m_Database.Get( 205 List<RegionData> rdatas = m_Database.Get(
@@ -290,7 +293,7 @@ namespace OpenSim.Services.GridService
290 293
291 // Region reregistering in other coordinates. Delete the old entry 294 // Region reregistering in other coordinates. Delete the old entry
292 m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) was previously registered at {2}-{3}. Deleting old entry.", 295 m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) was previously registered at {2}-{3}. Deleting old entry.",
293 regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY); 296 regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionCoordX, regionInfos.RegionCoordY);
294 297
295 try 298 try
296 { 299 {