aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMic Bowman2014-01-28 16:34:49 -0800
committerMic Bowman2014-01-28 16:34:49 -0800
commitcfe1bced7d4477bd231d08f5394c30622a3156d1 (patch)
treea16436379b41951a93d9a10ffaa7b5d5a14ff37f /OpenSim
parentActually make the parameter updates change the behavior of (diff)
parentclear land tainting when tested. Then testing, pass scene to LandObject as no... (diff)
downloadopensim-SC_OLD-cfe1bced7d4477bd231d08f5394c30622a3156d1.zip
opensim-SC_OLD-cfe1bced7d4477bd231d08f5394c30622a3156d1.tar.gz
opensim-SC_OLD-cfe1bced7d4477bd231d08f5394c30622a3156d1.tar.bz2
opensim-SC_OLD-cfe1bced7d4477bd231d08f5394c30622a3156d1.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/TerrainData.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs2
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs
index d1e0e7e..9325df2 100644
--- a/OpenSim/Framework/TerrainData.cs
+++ b/OpenSim/Framework/TerrainData.cs
@@ -160,7 +160,11 @@ namespace OpenSim.Framework
160 160
161 public override bool IsTaintedAt(int xx, int yy) 161 public override bool IsTaintedAt(int xx, int yy)
162 { 162 {
163 return m_taint[xx / Constants.TerrainPatchSize, yy / Constants.TerrainPatchSize]; 163 int tx = xx / Constants.TerrainPatchSize;
164 int ty = yy / Constants.TerrainPatchSize;
165 bool ret = m_taint[tx, ty];
166 m_taint[tx, ty] = false;
167 return ret;
164 } 168 }
165 169
166 // TerrainData.GetDatabaseBlob 170 // TerrainData.GetDatabaseBlob
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 53f41f9..e08a42d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -579,7 +579,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
579 ArchiveConstants.CONTROL_FILE_PATH, 579 ArchiveConstants.CONTROL_FILE_PATH,
580 new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); 580 new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
581 581
582 LandObject lo = new LandObject(groupID, true, null); 582 LandObject lo = new LandObject(groupID, true, m_scene);
583 lo.SetLandBitmap(lo.BasicFullRegionLandBitmap()); 583 lo.SetLandBitmap(lo.BasicFullRegionLandBitmap());
584 LandData ld = lo.LandData; 584 LandData ld = lo.LandData;
585 ld.GlobalID = landID; 585 ld.GlobalID = landID;