diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index bb06996..2701f60 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -44,7 +44,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
44 | #region Member Variables | 44 | #region Member Variables |
45 | 45 | ||
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | #pragma warning disable 0429 | ||
47 | private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; | 48 | private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; |
49 | #pragma warning restore 0429 | ||
48 | private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; | 50 | private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; |
49 | 51 | ||
50 | protected LandData m_landData = new LandData(); | 52 | protected LandData m_landData = new LandData(); |
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 6a5317b..c525227 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | |||
@@ -658,8 +658,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
658 | 658 | ||
659 | public class LargeLandChannel : ILandChannel | 659 | public class LargeLandChannel : ILandChannel |
660 | { | 660 | { |
661 | private static readonly ILog m_log = | 661 | // private static readonly ILog m_log = |
662 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 662 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
663 | private RegionData RegData; | 663 | private RegionData RegData; |
664 | private ILandChannel RootRegionLandChannel; | 664 | private ILandChannel RootRegionLandChannel; |
665 | private readonly List<RegionData> RegionConnections; | 665 | private readonly List<RegionData> RegionConnections; |