From 6fbfb47b92cf01b839208d0cc7898749306e19f4 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 19 Jan 2014 11:03:08 -0800
Subject: 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.

---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/RemoteController')

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
                     }
 
                     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");
 
-- 
cgit v1.1