aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorOren Hurvitz2014-05-26 15:19:20 +0300
committerOren Hurvitz2014-05-26 15:33:13 +0100
commit33cc847c4ac78b890f8ac175c479ab1b1c56cbbf (patch)
tree81030a1fbc63fd8413943ccaa7c0c06331f6532a /OpenSim/Region/CoreModules
parentPrevent login to a region if the Telehub or Landing Point are in a banned parcel (diff)
downloadopensim-SC_OLD-33cc847c4ac78b890f8ac175c479ab1b1c56cbbf.zip
opensim-SC_OLD-33cc847c4ac78b890f8ac175c479ab1b1c56cbbf.tar.gz
opensim-SC_OLD-33cc847c4ac78b890f8ac175c479ab1b1c56cbbf.tar.bz2
opensim-SC_OLD-33cc847c4ac78b890f8ac175c479ab1b1c56cbbf.tar.xz
When saving an OAR in "Publish" mode, also discard Group information
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs3
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());