From bf3956aeb0a44d0dd455e330234fcf0e18f5ea43 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Apr 2010 22:29:11 +0100
Subject: Add --skip-assets option to load oar. This allows you to load an oar
 without loading its assets.  This is useful if you know that the required
 assets are already in the asset service, since loading without assets is
 quicker. This option will become more useful when the ability to save oars
 without assets is added, which should happen fairly soon.  At this point
 there will also be better documentation.

---
 OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 12 ++++++++++--
 1 file changed, 10 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 991d60c..89e59d0 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -90,8 +90,12 @@ namespace OpenSim.Region.Framework.Interfaces
         /// 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, Guid requestId);
+        void DearchiveRegion(string loadPath, bool merge, bool skipAssets, Guid requestId);
         
         /// <summary>
         /// Dearchive a region from a stream.  This replaces the existing scene. 
@@ -113,7 +117,11 @@ namespace OpenSim.Region.Framework.Interfaces
         /// 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, Guid requestId);
+        void DearchiveRegion(Stream loadStream, bool merge, bool skipAssets, Guid requestId);
     }
 }
-- 
cgit v1.1