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.

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
                 if (RegionSizeX != RegionSizeY)
                 {
                     uint minSize = Math.Min(RegionSizeX, RegionSizeY);
-                    RegionSizeX = minSize;
-                    RegionSizeY = minSize;
-                    m_log.ErrorFormat("{0} Regions must be square until viewers are updated. Forcing region {1} size to <{2},{3}>",
-                                        LogHeader, m_regionName, RegionSizeX, RegionSizeY);
+////                    RegionSizeX = minSize;
+////                    RegionSizeY = minSize;
+                    m_log.WarnFormat("{0} Regions must be square until viewers are updated. NOT Forcing region {1} size to <{2},{3}>",
+                                        LogHeader, m_regionName, minSize, minSize);
                 }
 
                 // 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
                 return "Invalid RegionID - cannot be zero UUID";
 
             if (regionInfos.RegionLocY <= Constants.MaximumRegionSize)
-                return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString();
+                m_log.WarnFormat("{0} Region location reserved for HG links coord Y should be higher than {1}.", LogHeader, (Constants.MaximumRegionSize/256).ToString());
+////                return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString();
 
             String reason = "Region overlaps another region";