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/Region/Framework/Interfaces/IRegionArchiverModule.cs | 6 ++++--
 OpenSim/Region/Framework/Interfaces/ITerrainModule.cs        | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 3fafc47..1c00b6c 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -29,6 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
+using OpenMetaverse;
+
 namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
@@ -109,7 +111,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// assets are already known to be present in the grid's asset service.
         /// </param>
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void DearchiveRegion(string loadPath, bool merge, bool skipAssets, Guid requestId);
+        void DearchiveRegion(string loadPath, bool merge, bool skipAssets, Vector3 displacement, Guid requestId);
         
         /// <summary>
         /// Dearchive a region from a stream.  This replaces the existing scene. 
@@ -136,6 +138,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// assets are already known to be present in the grid's asset service.
         /// </param
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void DearchiveRegion(Stream loadStream, bool merge, bool skipAssets, Guid requestId);
+        void DearchiveRegion(Stream loadStream, bool merge, bool skipAssets, Vector3 displacement, Guid requestId);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
index 5947afb..189a30a 100644
--- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -51,6 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </param>
         /// <param name="stream"></param>
         void LoadFromStream(string filename, Stream stream);
+        void LoadFromStream(string filename, Vector2 displacement, Stream stream);
         void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap);
         /// <summary>
         /// Save a terrain to a stream.
-- 
cgit v1.1