diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-29 23:49:48 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-29 23:49:48 -0400 |
| commit | efe737b895f324c0608263870e9ed95eb2ee44ac (patch) | |
| tree | c6bce7e8d61523e0901ad6a8f79489a79019438e /OpenSim | |
| parent | * Rename the RegionCombiner Module from PhysicsCombiner (diff) | |
| download | opensim-SC_OLD-efe737b895f324c0608263870e9ed95eb2ee44ac.zip opensim-SC_OLD-efe737b895f324c0608263870e9ed95eb2ee44ac.tar.gz opensim-SC_OLD-efe737b895f324c0608263870e9ed95eb2ee44ac.tar.bz2 opensim-SC_OLD-efe737b895f324c0608263870e9ed95eb2ee44ac.tar.xz | |
Ok, merging the RegionCombinerModule with master.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 9 |
1 files changed, 5 insertions, 4 deletions
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 | |||
| 27 | public void Initialise(IConfigSource source) | 27 | public void Initialise(IConfigSource source) |
| 28 | { | 28 | { |
| 29 | IConfig myConfig = source.Configs["Startup"]; | 29 | IConfig myConfig = source.Configs["Startup"]; |
| 30 | enabledYN = myConfig.GetBoolean("CombineContiguiousRegions", false); | 30 | enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false); |
| 31 | |||
| 31 | } | 32 | } |
| 32 | 33 | ||
| 33 | public void Close() | 34 | public void Close() |
| @@ -528,7 +529,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 528 | 529 | ||
| 529 | public List<ILandObject> ParcelsNearPoint(Vector3 position) | 530 | public List<ILandObject> ParcelsNearPoint(Vector3 position) |
| 530 | { | 531 | { |
| 531 | m_log.DebugFormat("[LANDPARCELNEARPOINT]: {0}>", position); | 532 | //m_log.DebugFormat("[LANDPARCELNEARPOINT]: {0}>", position); |
| 532 | return RootRegionLandChannel.ParcelsNearPoint(position - RegData.Offset); | 533 | return RootRegionLandChannel.ParcelsNearPoint(position - RegData.Offset); |
| 533 | } | 534 | } |
| 534 | 535 | ||
| @@ -541,7 +542,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 541 | 542 | ||
| 542 | public ILandObject GetLandObject(int x, int y) | 543 | public ILandObject GetLandObject(int x, int y) |
| 543 | { | 544 | { |
| 544 | m_log.DebugFormat("[BIGLANDTESTINT]: <{0},{1}>", x, y); | 545 | //m_log.DebugFormat("[BIGLANDTESTINT]: <{0},{1}>", x, y); |
| 545 | 546 | ||
| 546 | if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize) | 547 | if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize) |
| 547 | { | 548 | { |
| @@ -574,7 +575,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 574 | 575 | ||
| 575 | public ILandObject GetLandObject(float x, float y) | 576 | public ILandObject GetLandObject(float x, float y) |
| 576 | { | 577 | { |
| 577 | m_log.DebugFormat("[BIGLANDTESTFLOAT]: <{0},{1}>", x, y); | 578 | //m_log.DebugFormat("[BIGLANDTESTFLOAT]: <{0},{1}>", x, y); |
| 578 | 579 | ||
| 579 | if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize) | 580 | if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize) |
| 580 | { | 581 | { |