* Make it possible to add a request id to load and save oar requests

* This allows specific requests to be identified.

2 files changed, 27 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 601b83e..530fb79 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.IO;
 
 namespace OpenSim.Region.Framework.Interfaces
@@ -43,6 +44,17 @@ namespace OpenSim.Region.Framework.Interfaces
         /// 
         /// <param name="savePath"></param>
         void ArchiveRegion(string savePath);
+        
+        /// <summary>
+        /// Archive the region to the given path
+        /// </summary>
+        /// 
+        /// This method occurs asynchronously.  If you want notification of when it has completed then subscribe to
+        /// the EventManager.OnOarFileSaved event.
+        /// 
+        /// <param name="savePath"></param>  
+        /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
+        void ArchiveRegion(string savePath, Guid requestId);        
 
         /// <summary>
         /// Archive the region to a stream.
@@ -52,7 +64,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// the EventManager.OnOarFileSaved event.
         /// 
         /// <param name="saveStream"></param>
-        void ArchiveRegion(Stream saveStream);
+        /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
+        void ArchiveRegion(Stream saveStream, Guid requestId);
 
         /// <summary>
         /// Dearchive the given region archive.  This replaces the existing scene.
@@ -74,7 +87,8 @@ 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>
-        void DearchiveRegion(string loadPath, bool merge);        
+        /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
+        void DearchiveRegion(string loadPath, bool merge, Guid requestId);        
         
         /// <summary>
         /// Dearchive a region from a stream.  This replaces the existing scene. 
@@ -95,7 +109,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <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>        
-        void DearchiveRegion(Stream loadStream, bool merge);        
+        /// </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);        
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 7496af0..469f139 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -279,14 +279,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// the scripts may not have started yet
         /// Message is non empty string if there were problems loading the oar file
         /// </summary>
-        public delegate void OarFileLoaded(string message);
+        public delegate void OarFileLoaded(Guid guid, string message);
         public event OarFileLoaded OnOarFileLoaded;
         
         /// <summary>
         /// Called when an oar file has finished saving
         /// Message is non empty string if there were problems saving the oar file
+        /// If a guid was supplied on the original call to identify, the request, this is returned.  Otherwise 
+        /// Guid.Empty is returned.
         /// </summary>
-        public delegate void OarFileSaved(string message);
+        public delegate void OarFileSaved(Guid guid, string message);
         public event OarFileSaved OnOarFileSaved;        
 
         /// <summary>
@@ -968,18 +970,18 @@ namespace OpenSim.Region.Framework.Scenes
             return 6;
         }
 
-        public void TriggerOarFileLoaded(string message)
+        public void TriggerOarFileLoaded(Guid requestId, string message)
         {
             handlerOarFileLoaded = OnOarFileLoaded;
             if (handlerOarFileLoaded != null)
-                handlerOarFileLoaded(message);
+                handlerOarFileLoaded(requestId, message);
         }
         
-        public void TriggerOarFileSaved(string message)
+        public void TriggerOarFileSaved(Guid requestId, string message)
         {
             handlerOarFileSaved = OnOarFileSaved;
             if (handlerOarFileSaved != null)
-                handlerOarFileSaved(message);
+                handlerOarFileSaved(requestId, message);
         }        
 
         public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message)