diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 23008a0..0c4b79b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -130,6 +130,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
130 | /// </value> | 130 | /// </value> |
131 | protected Vector3 m_rotationCenter = new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0f); | 131 | protected Vector3 m_rotationCenter = new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0f); |
132 | 132 | ||
133 | protected bool m_noObjects = false; | ||
134 | |||
133 | /// <summary> | 135 | /// <summary> |
134 | /// Used to cache lookups for valid uuids. | 136 | /// Used to cache lookups for valid uuids. |
135 | /// </summary> | 137 | /// </summary> |
@@ -179,6 +181,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
179 | m_merge = options.ContainsKey("merge"); | 181 | m_merge = options.ContainsKey("merge"); |
180 | m_forceTerrain = options.ContainsKey("force-terrain"); | 182 | m_forceTerrain = options.ContainsKey("force-terrain"); |
181 | m_forceParcels = options.ContainsKey("force-parcels"); | 183 | m_forceParcels = options.ContainsKey("force-parcels"); |
184 | m_noObjects = options.ContainsKey("no-objects"); | ||
182 | m_skipAssets = options.ContainsKey("skipAssets"); | 185 | m_skipAssets = options.ContainsKey("skipAssets"); |
183 | m_requestId = requestId; | 186 | m_requestId = requestId; |
184 | m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero; | 187 | m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero; |
@@ -261,7 +264,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
261 | 264 | ||
262 | // Process the file | 265 | // Process the file |
263 | 266 | ||
264 | if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) | 267 | if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH) && !m_noObjects) |
265 | { | 268 | { |
266 | sceneContext.SerialisedSceneObjects.Add(Encoding.UTF8.GetString(data)); | 269 | sceneContext.SerialisedSceneObjects.Add(Encoding.UTF8.GetString(data)); |
267 | } | 270 | } |