aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver
diff options
context:
space:
mode:
authorMelanie2012-08-04 03:00:20 +0100
committerMelanie2012-08-04 03:00:20 +0100
commitb9c4a637b46d0c47d5348181dd75c4cc3d44f43d (patch)
tree7cf26233b2aaea5556f9842d7a44e35860098a95 /OpenSim/Region/CoreModules/World/Archiver
parentMerge branch 'master' into careminster (diff)
parentStrip experimental tag from --publish option of "save oar" region console com... (diff)
downloadopensim-SC_OLD-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.zip
opensim-SC_OLD-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.gz
opensim-SC_OLD-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.bz2
opensim-SC_OLD-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index c179a34..0780d86 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
124 LandData landData = lo.LandData; 124 LandData landData = lo.LandData;
125 string landDataPath = String.Format("{0}{1}.xml", ArchiveConstants.LANDDATA_PATH, 125 string landDataPath = String.Format("{0}{1}.xml", ArchiveConstants.LANDDATA_PATH,
126 landData.GlobalID.ToString()); 126 landData.GlobalID.ToString());
127 m_archiveWriter.WriteFile(landDataPath, LandDataSerializer.Serialize(landData)); 127 m_archiveWriter.WriteFile(landDataPath, LandDataSerializer.Serialize(landData, m_options));
128 } 128 }
129 129
130 m_log.InfoFormat("[ARCHIVER]: Adding terrain information to archive."); 130 m_log.InfoFormat("[ARCHIVER]: Adding terrain information to archive.");