OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

varregion: Enforce the configuration of square regions in RegionInfo.cs.

varregion
Robert Adams 2013-11-02 15:36:16 -07:00
parent 92c06a5d0b
commit f66737fe56
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Framework/RegionInfo.cs
View File

@ -767,7 +767,7 @@ namespace OpenSim.Framework
RegionSizeX -= partial; RegionSizeX -= partial;
if (RegionSizeX == 0) if (RegionSizeX == 0)
RegionSizeX = Constants.RegionSize; RegionSizeX = Constants.RegionSize;
m_log.WarnFormat("{0} Region size must be multiple of {1}. Enforcing {2}.RegionSizeX={3} instead of specified {4}", m_log.ErrorFormat("{0} Region size must be multiple of {1}. Enforcing {2}.RegionSizeX={3} instead of specified {4}",
LogHeader, Constants.RegionSize, m_regionName, RegionSizeX, RegionSizeX + partial); LogHeader, Constants.RegionSize, m_regionName, RegionSizeX, RegionSizeX + partial);
} }
partial = RegionSizeY % Constants.RegionSize; partial = RegionSizeY % Constants.RegionSize;
@ -776,10 +776,22 @@ namespace OpenSim.Framework
RegionSizeY -= partial; RegionSizeY -= partial;
if (RegionSizeY == 0) if (RegionSizeY == 0)
RegionSizeY = Constants.RegionSize; RegionSizeY = Constants.RegionSize;
m_log.WarnFormat("{0} Region size must be multiple of {1}. Enforcing {2}.RegionSizeY={3} instead of specified {4}", m_log.ErrorFormat("{0} Region size must be multiple of {1}. Enforcing {2}.RegionSizeY={3} instead of specified {4}",
LogHeader, Constants.RegionSize, m_regionName, RegionSizeY, RegionSizeY + partial); LogHeader, Constants.RegionSize, m_regionName, RegionSizeY, RegionSizeY + partial);
} }
m_log.InfoFormat("{0} Region {1} size set to x={2}, y={3}", LogHeader, m_regionName, RegionSizeX, RegionSizeY);
// Because of things in the viewer, regions MUST be square.
// Remove this check when viewers have been updated.
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);
}
m_log.InfoFormat("{0} Region {1} size set to <{2},{3}>", LogHeader, m_regionName, RegionSizeX, RegionSizeY);
} }
} }