diff options
| author | Diva Canto | 2014-05-26 08:14:34 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-05-26 08:14:34 -0700 |
| commit | b778bd9423f0a26f231e88da7cb572ae4c33ba5a (patch) | |
| tree | 34796ee627e3ac7b0828097b277e9172b03339c2 /OpenSim/Region/CoreModules | |
| parent | Adds an optional redirect URL to the asset server handler for when assets are... (diff) | |
| parent | When saving an OAR in "Publish" mode, also discard Group information (diff) | |
| download | opensim-SC_OLD-b778bd9423f0a26f231e88da7cb572ae4c33ba5a.zip opensim-SC_OLD-b778bd9423f0a26f231e88da7cb572ae4c33ba5a.tar.gz opensim-SC_OLD-b778bd9423f0a26f231e88da7cb572ae4c33ba5a.tar.bz2 opensim-SC_OLD-b778bd9423f0a26f231e88da7cb572ae4c33ba5a.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index e08a42d..b31257d 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
| @@ -585,7 +585,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
| 585 | ld.GlobalID = landID; | 585 | ld.GlobalID = landID; |
| 586 | 586 | ||
| 587 | string ldPath = ArchiveConstants.CreateOarLandDataPath(ld); | 587 | string ldPath = ArchiveConstants.CreateOarLandDataPath(ld); |
| 588 | tar.WriteFile(ldPath, LandDataSerializer.Serialize(ld, null)); | 588 | Dictionary<string, object> options = new Dictionary<string, object>(); |
| 589 | tar.WriteFile(ldPath, LandDataSerializer.Serialize(ld, options)); | ||
| 589 | tar.Close(); | 590 | tar.Close(); |
| 590 | 591 | ||
| 591 | oarStream = new MemoryStream(oarStream.ToArray()); | 592 | oarStream = new MemoryStream(oarStream.ToArray()); |