1 files changed, 49 insertions, 35 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
index 7bdd65c..cb2c7f1 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -36,6 +36,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Serialization;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
@@ -43,7 +44,9 @@ using OpenSim.Region.Framework.Scenes;
 using Ionic.Zlib;
 using GZipStream = Ionic.Zlib.GZipStream;
 using CompressionMode = Ionic.Zlib.CompressionMode;
+using CompressionLevel = Ionic.Zlib.CompressionLevel;
 using OpenSim.Framework.Serialization.External;
+using PermissionMask = OpenSim.Framework.PermissionMask;
 
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
@@ -78,7 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// Determines which objects will be included in the archive, according to their permissions.
         /// Default is null, meaning no permission checks.
         /// </summary>
-        public string CheckPermissions { get; set; }
+        public string FilterContent { get; set; }
 
         protected Scene m_rootScene;
         protected Stream m_saveStream;
@@ -129,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             MultiRegionFormat = false;
             SaveAssets = true;
-            CheckPermissions = null;
+            FilterContent = null;
         }
 
         /// <summary>
@@ -148,7 +151,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             Object temp;
             if (options.TryGetValue("checkPermissions", out temp))
-                CheckPermissions = (string)temp;
+                FilterContent = (string)temp;
 
 
             // Find the regions to archive
@@ -177,7 +180,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 // Archive the regions
 
-                Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>();
+                Dictionary<UUID, sbyte> assetUuids = new Dictionary<UUID, sbyte>();
 
                 scenesGroup.ForEachScene(delegate(Scene scene)
                 {
@@ -198,7 +201,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             m_rootScene.AssetService, m_rootScene.UserAccountService,
                             m_rootScene.RegionInfo.ScopeID, options, ReceivedAllAssets);
 
-                    Util.FireAndForget(o => ar.Execute());
+                    WorkManager.RunInThread(o => ar.Execute(), null, "Archive Assets Request");
 
                     // CloseArchive() will be called from ReceivedAllAssets()
                 }
@@ -215,9 +218,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
         }
 
-        private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, AssetType> assetUuids)
+        private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, sbyte> assetUuids)
         {
-            m_log.InfoFormat("[ARCHIVER]: Writing region {0}", scene.RegionInfo.RegionName);
+            m_log.InfoFormat("[ARCHIVER]: Writing region {0}", scene.Name);
 
             EntityBase[] entities = scene.GetEntities();
             List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
@@ -236,7 +239,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                     if (!sceneObject.IsDeleted && !sceneObject.IsAttachment)
                     {
-                        if (!CanUserArchiveObject(scene.RegionInfo.EstateSettings.EstateOwner, sceneObject, CheckPermissions, permissionsModule))
+                        if (!CanUserArchiveObject(scene.RegionInfo.EstateSettings.EstateOwner, sceneObject, FilterContent, permissionsModule))
                         {
                             // The user isn't allowed to copy/transfer this object, so it will not be included in the OAR.
                             ++numObjectsSkippedPermissions;
@@ -251,13 +254,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             if (SaveAssets)
             {
-                UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService);
+                UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids);
                 int prevAssets = assetUuids.Count;
                     
                 foreach (SceneObjectGroup sceneObject in sceneObjects)
-                {
-                    assetGatherer.GatherAssetUuids(sceneObject, assetUuids);
-                }
+                    assetGatherer.AddForInspection(sceneObject);
+
+                assetGatherer.GatherAll();
 
                 m_log.DebugFormat(
                     "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
@@ -275,16 +278,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             RegionSettings regionSettings = scene.RegionInfo.RegionSettings;
     
             if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1)
-                assetUuids[regionSettings.TerrainTexture1] = AssetType.Texture;
+                assetUuids[regionSettings.TerrainTexture1] = (sbyte)AssetType.Texture;
                 
             if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2)
-                assetUuids[regionSettings.TerrainTexture2] = AssetType.Texture;
+                assetUuids[regionSettings.TerrainTexture2] = (sbyte)AssetType.Texture;
                 
             if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3)
-                assetUuids[regionSettings.TerrainTexture3] = AssetType.Texture;
+                assetUuids[regionSettings.TerrainTexture3] = (sbyte)AssetType.Texture;
                 
             if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
-                assetUuids[regionSettings.TerrainTexture4] = AssetType.Texture;
+                assetUuids[regionSettings.TerrainTexture4] = (sbyte)AssetType.Texture;
 
             Save(scene, sceneObjects, regionDir);
         }
@@ -294,12 +297,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         /// <param name="user">The user</param>
         /// <param name="objGroup">The object group</param>
-        /// <param name="checkPermissions">Which permissions to check: "C" = Copy, "T" = Transfer</param>
+        /// <param name="filterContent">Which permissions to check: "C" = Copy, "T" = Transfer</param>
         /// <param name="permissionsModule">The scene's permissions module</param>
         /// <returns>Whether the user is allowed to export the object to an OAR</returns>
-        private bool CanUserArchiveObject(UUID user, SceneObjectGroup objGroup, string checkPermissions, IPermissionsModule permissionsModule)
+        private bool CanUserArchiveObject(UUID user, SceneObjectGroup objGroup, string filterContent, IPermissionsModule permissionsModule)
         {
-            if (checkPermissions == null)
+            if (filterContent == null)
                 return true;
 
             if (permissionsModule == null)
@@ -341,9 +344,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     canTransfer |= (obj.EveryoneMask & (uint)PermissionMask.Copy) != 0;
 
                 bool partPermitted = true;
-                if (checkPermissions.Contains("C") && !canCopy)
+                if (filterContent.Contains("C") && !canCopy)
                     partPermitted = false;
-                if (checkPermissions.Contains("T") && !canTransfer)
+                if (filterContent.Contains("T") && !canTransfer)
                     partPermitted = false;
 
                 // If the user is the Creator of the object then it can always be included in the OAR
@@ -532,7 +535,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (isMegaregion)
                 size = rcMod.GetSizeOfMegaregion(scene.RegionInfo.RegionID);
             else
-                size = new Vector2((float)Constants.RegionSize, (float)Constants.RegionSize);
+                size = new Vector2((float)scene.RegionInfo.RegionSizeX, (float)scene.RegionInfo.RegionSizeY);
     
             xtw.WriteElementString("is_megaregion", isMegaregion.ToString());
             xtw.WriteElementString("size_in_meters", string.Format("{0},{1}", size.X, size.Y));
@@ -568,10 +571,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             string terrainPath = String.Format("{0}{1}{2}.r32",
                 regionDir, ArchiveConstants.TERRAINS_PATH, scene.RegionInfo.RegionName);
 
-            MemoryStream ms = new MemoryStream();
-            scene.RequestModuleInterface<ITerrainModule>().SaveToStream(terrainPath, ms);
-            m_archiveWriter.WriteFile(terrainPath, ms.ToArray());
-            ms.Close();
+            using (MemoryStream ms = new MemoryStream())
+            {
+                scene.RequestModuleInterface<ITerrainModule>().SaveToStream(terrainPath, ms);
+                m_archiveWriter.WriteFile(terrainPath, ms.ToArray());
+            }
 
             m_log.InfoFormat("[ARCHIVER]: Adding scene objects to archive.");
 
@@ -587,19 +591,29 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
         }
         
-        protected void ReceivedAllAssets(
-            ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)
+        protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids, bool timedOut)
         {
-            foreach (UUID uuid in assetsNotFoundUuids)
+            string errorMessage;
+            
+            if (timedOut)
             {
-                m_log.DebugFormat("[ARCHIVER]: Could not find asset {0}", uuid);
+                errorMessage = "Loading assets timed out";
             }
+            else
+            {
+                foreach (UUID uuid in assetsNotFoundUuids)
+                {
+                    m_log.DebugFormat("[ARCHIVER]: Could not find asset {0}", uuid);
+                }
 
-            //            m_log.InfoFormat(
-            //                "[ARCHIVER]: Received {0} of {1} assets requested",
-            //                assetsFoundUuids.Count, assetsFoundUuids.Count + assetsNotFoundUuids.Count);
+                //            m_log.InfoFormat(
+                //                "[ARCHIVER]: Received {0} of {1} assets requested",
+                //                assetsFoundUuids.Count, assetsFoundUuids.Count + assetsNotFoundUuids.Count);
 
-            CloseArchive(String.Empty);
+                errorMessage = String.Empty;
+            }
+            
+            CloseArchive(errorMessage);
         }
         
         /// <summary>
@@ -626,4 +640,4 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_rootScene.EventManager.TriggerOarFileSaved(m_requestId, errorMessage);
         }
     }
-}
\ No newline at end of file
+}