diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Constants.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs index 64912b4..ea89db3 100644 --- a/OpenSim/Framework/Constants.cs +++ b/OpenSim/Framework/Constants.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Framework | |||
37 | // DO NOT USE THIS FOR ANY NEW CODE. Use Scene.RegionInfo.RegionSize[XYZ] as a region might not | 37 | // DO NOT USE THIS FOR ANY NEW CODE. Use Scene.RegionInfo.RegionSize[XYZ] as a region might not |
38 | // be the legacy region size. | 38 | // be the legacy region size. |
39 | public const uint RegionSize = 256; | 39 | public const uint RegionSize = 256; |
40 | public const uint RegionHeight = 4096; | 40 | public const uint RegionHeight = 16384; |
41 | 41 | ||
42 | public const uint MaximumRegionSize = 4096; | 42 | public const uint MaximumRegionSize = 4096; |
43 | 43 | ||
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index b88d31f..df0b8da 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -846,10 +846,10 @@ namespace OpenSim.Framework | |||
846 | if (RegionSizeX != RegionSizeY) | 846 | if (RegionSizeX != RegionSizeY) |
847 | { | 847 | { |
848 | uint minSize = Math.Min(RegionSizeX, RegionSizeY); | 848 | uint minSize = Math.Min(RegionSizeX, RegionSizeY); |
849 | RegionSizeX = minSize; | 849 | //// RegionSizeX = minSize; |
850 | RegionSizeY = minSize; | 850 | //// RegionSizeY = minSize; |
851 | m_log.ErrorFormat("{0} Regions must be square until viewers are updated. Forcing region {1} size to <{2},{3}>", | 851 | m_log.WarnFormat("{0} Regions must be square until viewers are updated. NOT Forcing region {1} size to <{2},{3}>", |
852 | LogHeader, m_regionName, RegionSizeX, RegionSizeY); | 852 | LogHeader, m_regionName, minSize, minSize); |
853 | } | 853 | } |
854 | 854 | ||
855 | // There is a practical limit to region size. | 855 | // There is a practical limit to region size. |