clear land tainting when tested. Then testing, pass scene to LandObject as now needed to get region size

0.8.0.3
Robert Adams 2014-01-28 16:25:01 -08:00
parent d25265ae82
commit 0c3493f619
2 changed files with 6 additions and 2 deletions

View File

@ -160,7 +160,11 @@ namespace OpenSim.Framework
public override bool IsTaintedAt(int xx, int yy)
{
return m_taint[xx / Constants.TerrainPatchSize, yy / Constants.TerrainPatchSize];
int tx = xx / Constants.TerrainPatchSize;
int ty = yy / Constants.TerrainPatchSize;
bool ret = m_taint[tx, ty];
m_taint[tx, ty] = false;
return ret;
}
// TerrainData.GetDatabaseBlob

View File

@ -579,7 +579,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
ArchiveConstants.CONTROL_FILE_PATH,
new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
LandObject lo = new LandObject(groupID, true, null);
LandObject lo = new LandObject(groupID, true, m_scene);
lo.SetLandBitmap(lo.BasicFullRegionLandBitmap());
LandData ld = lo.LandData;
ld.GlobalID = landID;