1 files changed, 54 insertions, 37 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 38bd149..ff583e5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -42,6 +42,7 @@ using OpenSim.Framework.Communications.Osp;
 using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.CoreModules.World.Archiver;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
@@ -56,31 +57,32 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         private string m_invPath;
 
         /// <value>
+        /// We only use this to request modules
+        /// </value>
+        protected Scene m_scene;        
+
+        /// <value>
         /// The stream from which the inventory archive will be loaded.
         /// </value>
         private Stream m_loadStream;
 
-        protected CommunicationsManager m_commsManager;
-        protected IAssetService m_assetService;
-
         public InventoryArchiveReadRequest(
-            CachedUserInfo userInfo, string invPath, string loadPath, CommunicationsManager commsManager, IAssetService assetService)
+            Scene scene, CachedUserInfo userInfo, string invPath, string loadPath)
             : this(
+                scene,
                 userInfo,
                 invPath,
-                new GZipStream(new FileStream(loadPath, FileMode.Open), CompressionMode.Decompress),
-                commsManager, assetService)
+                new GZipStream(new FileStream(loadPath, FileMode.Open), CompressionMode.Decompress))
         {
         }
 
         public InventoryArchiveReadRequest(
-            CachedUserInfo userInfo, string invPath, Stream loadStream, CommunicationsManager commsManager, IAssetService assetService)
+            Scene scene, CachedUserInfo userInfo, string invPath, Stream loadStream)
         {
+            m_scene = scene;
             m_userInfo = userInfo;
             m_invPath = invPath;
             m_loadStream = loadStream;
-            m_commsManager = commsManager;
-            m_assetService = assetService;
         }
 
         /// <summary>
@@ -98,6 +100,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             int successfulItemRestores = 0;
             List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
 
+            /*
             if (!m_userInfo.HasReceivedInventory)
             {
                 // If the region server has access to the user admin service (by which users are created),
@@ -106,7 +109,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 //
                 // FIXME: FetchInventory should probably be assumed to by async anyway, since even standalones might
                 // use a remote inventory service, though this is vanishingly rare at the moment.
-                if (null == m_commsManager.UserAdminService)
+                if (null == m_scene.CommsManager.UserAdminService)
                 {
                     m_log.ErrorFormat(
                         "[INVENTORY ARCHIVER]: Have not yet received inventory info for user {0} {1}",
@@ -125,8 +128,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     }
                 }
             }
-
-            InventoryFolderImpl rootDestinationFolder = m_userInfo.RootFolder.FindFolderByPath(m_invPath);
+            */
+           
+            //InventoryFolderImpl rootDestinationFolder = m_userInfo.RootFolder.FindFolderByPath(m_invPath);
+            InventoryFolderBase rootDestinationFolder 
+                = InventoryArchiveUtils.FindFolderByPath(
+                    m_scene.InventoryService, m_userInfo.UserProfile.ID, m_invPath);
 
             if (null == rootDestinationFolder)
             {
@@ -140,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             // In order to load identically named folders, we need to keep track of the folders that we have already
             // created
-            Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();
+            Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
 
             byte[] data;
             TarArchiveReader.TarEntryType entryType;
@@ -155,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 }
                 else if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH))
                 {
-                    InventoryFolderImpl foundFolder 
+                    InventoryFolderBase foundFolder 
                         = ReplicateArchivePathToUserInventory(
                             filePath, TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType, 
                             rootDestinationFolder, foldersCreated, nodesLoaded);
@@ -167,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         // Don't use the item ID that's in the file
                         item.ID = UUID.Random();
 
-                        UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_commsManager); 
+                        UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.CommsManager); 
                         if (UUID.Zero != ospResolvedId)
                             item.CreatorIdAsUuid = ospResolvedId;
                         
@@ -176,7 +183,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         // Reset folder ID to the one in which we want to load it
                         item.Folder = foundFolder.ID;
 
-                        m_userInfo.AddItem(item);
+                        //m_userInfo.AddItem(item);
+                        m_scene.InventoryService.AddItem(item);                        
                         successfulItemRestores++;
 
                         // If we're loading an item directly into the given destination folder then we need to record
@@ -209,11 +217,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// chain, only the root node needs to be recorded
         /// </param>
         /// <returns>The last user inventory folder created or found for the archive path</returns>
-        public InventoryFolderImpl ReplicateArchivePathToUserInventory(
+        public InventoryFolderBase ReplicateArchivePathToUserInventory(
             string fsPath, 
             bool isDir, 
-            InventoryFolderImpl rootDestinationFolder, 
-            Dictionary <string, InventoryFolderImpl> foldersCreated,
+            InventoryFolderBase rootDestFolder, 
+            Dictionary <string, InventoryFolderBase> foldersCreated,
             List<InventoryNodeBase> nodesLoaded)
         {
             fsPath = fsPath.Substring(ArchiveConstants.INVENTORY_PATH.Length);
@@ -226,17 +234,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             m_log.DebugFormat("[INVENTORY ARCHIVER]: Loading to folder {0}", fsPath);
 
-            InventoryFolderImpl foundFolder = null;
+            InventoryFolderBase destFolder = null;
 
             // XXX: Nasty way of dealing with a path that has no directory component
             if (fsPath.Length > 0)
             {
-                while (null == foundFolder && fsPath.Length > 0)
+                while (null == destFolder && fsPath.Length > 0)
                 {
                     if (foldersCreated.ContainsKey(fsPath))
                     {
                         m_log.DebugFormat("[INVENTORY ARCHIVER]: Found previously created fs path {0}", fsPath);
-                        foundFolder = foldersCreated[fsPath];
+                        destFolder = foldersCreated[fsPath];
                     }
                     else
                     {
@@ -253,14 +261,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                                 "[INVENTORY ARCHIVER]: Found no previously created fs path for {0}",
                                 originalFsPath);
                             fsPath = string.Empty;
-                            foundFolder = rootDestinationFolder;
+                            destFolder = rootDestFolder;
                         }
                     }
                 }
             }
             else
             {
-                foundFolder = rootDestinationFolder;
+                destFolder = rootDestFolder;
             }
 
             string fsPathSectionToCreate = originalFsPath.Substring(fsPath.Length);
@@ -275,30 +283,39 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 int identicalNameIdentifierIndex
                     = rawDirsToCreate[i].LastIndexOf(
                         ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
-                string folderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
 
+                string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
                 UUID newFolderId = UUID.Random();
-                m_userInfo.CreateFolder(
-                    folderName, newFolderId, (ushort)AssetType.Folder, foundFolder.ID);
-
-                m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName);                
-                foundFolder = foundFolder.GetChildFolder(newFolderId);
-                m_log.DebugFormat(
-                    "[INVENTORY ARCHIVER]: Retrieved newly created folder {0} with ID {1}", 
-                    foundFolder.Name, foundFolder.ID);
+                
+                destFolder 
+                    = new InventoryFolderBase(
+                        newFolderId, newFolderName, m_userInfo.UserProfile.ID, 
+                        (short)AssetType.Folder, destFolder.ID, 0);
+                m_scene.InventoryService.AddFolder(destFolder);               
+                
+//                UUID newFolderId = UUID.Random();
+//                m_scene.InventoryService.AddFolder(
+//                m_userInfo.CreateFolder(
+//                    folderName, newFolderId, (ushort)AssetType.Folder, foundFolder.ID);
+
+//                m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName);                
+//                foundFolder = foundFolder.GetChildFolder(newFolderId);
+//                m_log.DebugFormat(
+//                    "[INVENTORY ARCHIVER]: Retrieved newly created folder {0} with ID {1}", 
+//                    foundFolder.Name, foundFolder.ID);
 
                 // Record that we have now created this folder
                 fsPath += rawDirsToCreate[i] + "/";
                 m_log.DebugFormat("[INVENTORY ARCHIVER]: Recording creation of fs path {0}", fsPath);
-                foldersCreated[fsPath] = foundFolder;
+                foldersCreated[fsPath] = destFolder;
 
                 if (0 == i)
-                    nodesLoaded.Add(foundFolder);
+                    nodesLoaded.Add(destFolder);
 
                 i++;
             }         
             
-            return foundFolder;
+            return destFolder;
             
             /*
             string[] rawFolders = filePath.Split(new char[] { '/' });
@@ -371,7 +388,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 asset.Type = assetType;
                 asset.Data = data;
 
-                m_assetService.Store(asset);
+                m_scene.AssetService.Store(asset);
 
                 return true;
             }