diff options
author | Robert Adams | 2014-01-19 11:03:08 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-19 11:03:08 -0800 |
commit | 6fbfb47b92cf01b839208d0cc7898749306e19f4 (patch) | |
tree | b833914d24f624662550e637b0ecabaf92d3e387 /OpenSim/ApplicationPlugins | |
parent | varregion: add --displacement parameter to 'load oar'. (diff) | |
download | opensim-SC_OLD-6fbfb47b92cf01b839208d0cc7898749306e19f4.zip opensim-SC_OLD-6fbfb47b92cf01b839208d0cc7898749306e19f4.tar.gz opensim-SC_OLD-6fbfb47b92cf01b839208d0cc7898749306e19f4.tar.bz2 opensim-SC_OLD-6fbfb47b92cf01b839208d0cc7898749306e19f4.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 3cd6b3b..7067a62 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -1484,9 +1484,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1484 | } | 1484 | } |
1485 | 1485 | ||
1486 | IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); | 1486 | IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); |
1487 | Vector3 displacement = new Vector3(0f, 0f, 0f); | 1487 | Dictionary<string, object> archiveOptions = new Dictionary<string,object>(); |
1488 | if (mergeOar) archiveOptions.Add("merge", null); | ||
1489 | if (skipAssets) archiveOptions.Add("skipAssets", null); | ||
1488 | if (archiver != null) | 1490 | if (archiver != null) |
1489 | archiver.DearchiveRegion(filename, mergeOar, skipAssets, displacement, Guid.Empty); | 1491 | archiver.DearchiveRegion(filename, Guid.Empty, archiveOptions); |
1490 | else | 1492 | else |
1491 | throw new Exception("Archiver module not present for scene"); | 1493 | throw new Exception("Archiver module not present for scene"); |
1492 | 1494 | ||