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

Ok, merging the RegionCombinerModule with master.

remotes/origin/0.6.7-post-fixes
Teravus Ovares (Dan Olivares) 2009-08-29 23:49:48 -04:00
parent 33f36c9010
commit efe737b895
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
View File

@ -27,7 +27,8 @@ namespace OpenSim.Region.CoreModules.World.Land
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
IConfig myConfig = source.Configs["Startup"]; IConfig myConfig = source.Configs["Startup"];
enabledYN = myConfig.GetBoolean("CombineContiguiousRegions", false); enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false);
} }
public void Close() public void Close()
@ -528,7 +529,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public List<ILandObject> ParcelsNearPoint(Vector3 position) public List<ILandObject> ParcelsNearPoint(Vector3 position)
{ {
m_log.DebugFormat("[LANDPARCELNEARPOINT]: {0}>", position); //m_log.DebugFormat("[LANDPARCELNEARPOINT]: {0}>", position);
return RootRegionLandChannel.ParcelsNearPoint(position - RegData.Offset); return RootRegionLandChannel.ParcelsNearPoint(position - RegData.Offset);
} }
@ -541,7 +542,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public ILandObject GetLandObject(int x, int y) 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) 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) 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) if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize)
{ {