diff options
| author | Mic Bowman | 2014-01-28 16:34:49 -0800 |
|---|---|---|
| committer | Mic Bowman | 2014-01-28 16:34:49 -0800 |
| commit | cfe1bced7d4477bd231d08f5394c30622a3156d1 (patch) | |
| tree | a16436379b41951a93d9a10ffaa7b5d5a14ff37f /OpenSim/Region/CoreModules | |
| parent | Actually make the parameter updates change the behavior of (diff) | |
| parent | clear land tainting when tested. Then testing, pass scene to LandObject as no... (diff) | |
| download | opensim-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/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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; |