From dd6db7293975bffc3693e0164dda8307a4e4bcf7 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 19 Jan 2014 10:09:43 -0800
Subject: varregion: add --displacement parameter to 'load oar'. Adds
 displacment to all objects and terrain loaded from the oar. As an example, if
 you have a 512x512 region and an old 256x256 oar, doing   load oar
 --displacement "<128,128,0>" oarFile.oar will load the object (and terrain)
 into the middle of the 512x512 region. If displacement is not specified,
 'load oar' works like it always has. If you have a 5

---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/ApplicationPlugins')

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 3cdf8d3..3cd6b3b 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1484,8 +1484,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     }
 
                     IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
+                    Vector3 displacement = new Vector3(0f, 0f, 0f);
                     if (archiver != null)
-                        archiver.DearchiveRegion(filename, mergeOar, skipAssets, Guid.Empty);
+                        archiver.DearchiveRegion(filename, mergeOar, skipAssets, displacement, Guid.Empty);
                     else
                         throw new Exception("Archiver module not present for scene");
 
-- 
cgit v1.1