aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2019-08-05 04:17:54 +1000
committeronefang2019-08-05 04:17:54 +1000
commit412e317b2f54db3b316d17d10dbf6c6ff7fa22c6 (patch)
treeeb5c1ce93fdf12f1edddf6977bf463d99413f2fc
parentMore basic web server. (diff)
downloadopensim-SC_OLD-412e317b2f54db3b316d17d10dbf6c6ff7fa22c6.zip
opensim-SC_OLD-412e317b2f54db3b316d17d10dbf6c6ff7fa22c6.tar.gz
opensim-SC_OLD-412e317b2f54db3b316d17d10dbf6c6ff7fa22c6.tar.bz2
opensim-SC_OLD-412e317b2f54db3b316d17d10dbf6c6ff7fa22c6.tar.xz
Limits -= 2
Low Y regions are no longer reserved for HG links. Varregions don't have to be square. Both now report a warning, but continue anyway. Cool VL Viewer handles non square regions, Singularity crashes. Not tested on others.
-rw-r--r--OpenSim/Framework/RegionInfo.cs8
-rw-r--r--OpenSim/Services/GridService/GridService.cs3
2 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8dac0ac..9e5162e 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -842,10 +842,10 @@ namespace OpenSim.Framework
842 if (RegionSizeX != RegionSizeY) 842 if (RegionSizeX != RegionSizeY)
843 { 843 {
844 uint minSize = Math.Min(RegionSizeX, RegionSizeY); 844 uint minSize = Math.Min(RegionSizeX, RegionSizeY);
845 RegionSizeX = minSize; 845//// RegionSizeX = minSize;
846 RegionSizeY = minSize; 846//// RegionSizeY = minSize;
847 m_log.ErrorFormat("{0} Regions must be square until viewers are updated. Forcing region {1} size to <{2},{3}>", 847 m_log.WarnFormat("{0} Regions must be square until viewers are updated. NOT Forcing region {1} size to <{2},{3}>",
848 LogHeader, m_regionName, RegionSizeX, RegionSizeY); 848 LogHeader, m_regionName, minSize, minSize);
849 } 849 }
850 850
851 // There is a practical limit to region size. 851 // There is a practical limit to region size.
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 2a2d8a8..e0500a6 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -198,7 +198,8 @@ namespace OpenSim.Services.GridService
198 return "Invalid RegionID - cannot be zero UUID"; 198 return "Invalid RegionID - cannot be zero UUID";
199 199
200 if (regionInfos.RegionLocY <= Constants.MaximumRegionSize) 200 if (regionInfos.RegionLocY <= Constants.MaximumRegionSize)
201 return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString(); 201 m_log.WarnFormat("{0} Region location reserved for HG links coord Y should be higher than {1}.", LogHeader, (Constants.MaximumRegionSize/256).ToString());
202//// return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString();
202 203
203 String reason = "Region overlaps another region"; 204 String reason = "Region overlaps another region";
204 205