diff options
author | Justin Clark-Casey (justincc) | 2010-10-16 05:38:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-16 05:38:44 +0100 |
commit | e41b23a1a4bef55d31f75e1227834da84cbd971a (patch) | |
tree | cf0a44403f242cd1aab6beee900e71e73fe0eff0 /OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | |
parent | Have OpenSim throw a strop if it tries to load an OAR with a major version th... (diff) | |
download | opensim-SC_OLD-e41b23a1a4bef55d31f75e1227834da84cbd971a.zip opensim-SC_OLD-e41b23a1a4bef55d31f75e1227834da84cbd971a.tar.gz opensim-SC_OLD-e41b23a1a4bef55d31f75e1227834da84cbd971a.tar.bz2 opensim-SC_OLD-e41b23a1a4bef55d31f75e1227834da84cbd971a.tar.xz |
change --old-guids switch on the save oar command line to --version=<x>
if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs index d1fe1f5..79bec56 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -137,12 +137,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
137 | 137 | ||
138 | m_log.InfoFormat("[ARCHIVER]: Added terrain information to archive."); | 138 | m_log.InfoFormat("[ARCHIVER]: Added terrain information to archive."); |
139 | 139 | ||
140 | Dictionary<string, object> serializationOptions = new Dictionary<string, object>(); | ||
141 | if (m_options.ContainsKey("version") && (string)m_options["version"] == "0") | ||
142 | serializationOptions["old-guids"] = true; | ||
143 | |||
140 | // Write out scene object metadata | 144 | // Write out scene object metadata |
141 | foreach (SceneObjectGroup sceneObject in m_sceneObjects) | 145 | foreach (SceneObjectGroup sceneObject in m_sceneObjects) |
142 | { | 146 | { |
143 | //m_log.DebugFormat("[ARCHIVER]: Saving {0} {1}, {2}", entity.Name, entity.UUID, entity.GetType()); | 147 | //m_log.DebugFormat("[ARCHIVER]: Saving {0} {1}, {2}", entity.Name, entity.UUID, entity.GetType()); |
144 | 148 | ||
145 | string serializedObject = m_serialiser.SerializeGroupToXml2(sceneObject, m_options); | 149 | string serializedObject = m_serialiser.SerializeGroupToXml2(sceneObject, serializationOptions); |
146 | m_archiveWriter.WriteFile(ArchiveHelpers.CreateObjectPath(sceneObject), serializedObject); | 150 | m_archiveWriter.WriteFile(ArchiveHelpers.CreateObjectPath(sceneObject), serializedObject); |
147 | } | 151 | } |
148 | 152 | ||