varregion: add --noterrain and --noparcel to 'load oar'.

--noterrain suppresses the loading of the terrain from the oar.
--noparcels suppresses the loading of parcel information from the oar.
This commit is contained in:
Robert Adams
2014-01-19 11:03:08 -08:00
parent dd6db72939
commit 6fbfb47b92
6 changed files with 70 additions and 46 deletions

View File

@@ -1484,9 +1484,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
}
IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
Vector3 displacement = new Vector3(0f, 0f, 0f);
Dictionary<string, object> archiveOptions = new Dictionary<string,object>();
if (mergeOar) archiveOptions.Add("merge", null);
if (skipAssets) archiveOptions.Add("skipAssets", null);
if (archiver != null)
archiver.DearchiveRegion(filename, mergeOar, skipAssets, displacement, Guid.Empty);
archiver.DearchiveRegion(filename, Guid.Empty, archiveOptions);
else
throw new Exception("Archiver module not present for scene");