From 134f86e8d5c414409631b25b8c6f0ee45fbd8631 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 3 Nov 2016 21:44:39 +1000
Subject: Initial update to OpenSim 0.8.2.1 source code.

---
 .../Framework/Interfaces/IRegionArchiverModule.cs  | 28 ++++++++--------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs')

diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 3fafc47..99bc87d 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>
@@ -100,16 +102,11 @@ namespace OpenSim.Region.Framework.Interfaces
         /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
         /// 
         /// <param name="loadPath"></param>
-        /// <param name="merge">
-        /// If true, the loaded region merges with the existing one rather than replacing it.  Any terrain or region
-        /// settings in the archive will be ignored.
-        /// </param>
-        /// <param name="skipAssets">
-        /// If true, the archive is loaded without loading any assets contained within it.  This is useful if the
-        /// 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);
+        /// <param name="options">
+        /// Dictionary of options.
+        /// </param>
+        void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options);
         
         /// <summary>
         /// Dearchive a region from a stream.  This replaces the existing scene. 
@@ -127,15 +124,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
         /// 
         /// <param name="loadStream"></param>
-        /// <param name="merge">
-        /// If true, the loaded region merges with the existing one rather than replacing it.  Any terrain or region
-        /// settings in the archive will be ignored.
-        /// </param>
-        /// <param name="skipAssets">
-        /// If true, the archive is loaded without loading any assets contained within it.  This is useful if the
-        /// 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);
+        /// <param name="options">
+        /// Dictionary of options.
+        /// </param>
+        void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string,object> options);
     }
 }
-- 
cgit v1.1