From 6cd0d7a62b696d28d488f3cb82838ccf973ccfd7 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Sat, 30 Nov 2013 15:28:39 -0800 Subject: varregion: Add MaxRegionSize constant and enforce in RegionInfo. Intermediate checkin of changing border cross computation from checking boundry limits to requests to GridService. Not totally functional. --- OpenSim/Framework/RegionInfo.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'OpenSim/Framework/RegionInfo.cs') diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index cf909cd..63b3d89 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -788,7 +788,16 @@ namespace OpenSim.Framework 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); + LogHeader, m_regionName, RegionSizeX, RegionSizeY); + } + + // There is a practical limit to region size. + if (RegionSizeX > Constants.MaximumRegionSize || RegionSizeY > Constants.MaximumRegionSize) + { + RegionSizeX = Util.Clamp(RegionSizeX, Constants.RegionSize, Constants.MaximumRegionSize); + RegionSizeY = Util.Clamp(RegionSizeY, Constants.RegionSize, Constants.MaximumRegionSize); + m_log.ErrorFormat("{0} Region dimensions must be less than {1}. Clamping {2}'s size to <{3},{4}>", + LogHeader, Constants.MaximumRegionSize, m_regionName, RegionSizeX, RegionSizeY); } m_log.InfoFormat("{0} Region {1} size set to <{2},{3}>", LogHeader, m_regionName, RegionSizeX, RegionSizeY); -- cgit v1.1