From efe737b895f324c0608263870e9ed95eb2ee44ac Mon Sep 17 00:00:00 2001 From: Teravus Ovares (Dan Olivares) Date: Sat, 29 Aug 2009 23:49:48 -0400 Subject: Ok, merging the RegionCombinerModule with master. --- OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/Land') diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 5ba6f39..381d5ec 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs @@ -27,7 +27,8 @@ namespace OpenSim.Region.CoreModules.World.Land public void Initialise(IConfigSource source) { IConfig myConfig = source.Configs["Startup"]; - enabledYN = myConfig.GetBoolean("CombineContiguiousRegions", false); + enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false); + } public void Close() @@ -528,7 +529,7 @@ namespace OpenSim.Region.CoreModules.World.Land public List ParcelsNearPoint(Vector3 position) { - m_log.DebugFormat("[LANDPARCELNEARPOINT]: {0}>", position); + //m_log.DebugFormat("[LANDPARCELNEARPOINT]: {0}>", position); return RootRegionLandChannel.ParcelsNearPoint(position - RegData.Offset); } @@ -541,7 +542,7 @@ namespace OpenSim.Region.CoreModules.World.Land public ILandObject GetLandObject(int x, int y) { - m_log.DebugFormat("[BIGLANDTESTINT]: <{0},{1}>", x, y); + //m_log.DebugFormat("[BIGLANDTESTINT]: <{0},{1}>", x, y); if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize) { @@ -574,7 +575,7 @@ namespace OpenSim.Region.CoreModules.World.Land public ILandObject GetLandObject(float x, float y) { - m_log.DebugFormat("[BIGLANDTESTFLOAT]: <{0},{1}>", x, y); + //m_log.DebugFormat("[BIGLANDTESTFLOAT]: <{0},{1}>", x, y); if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize) { -- cgit v1.1