1 files changed, 46 insertions, 46 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 5de8adc..d794f00 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -51,32 +51,32 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         private CachedUserInfo m_userInfo;
         private string m_invPath;
-        
+
         /// <value>
         /// The stream from which the inventory archive will be loaded.
         /// </value>
         private Stream m_loadStream;
-        
+
         CommunicationsManager commsManager;
 
         public InventoryArchiveReadRequest(
             CachedUserInfo userInfo, string invPath, string loadPath, CommunicationsManager commsManager)
             : this(
                 userInfo,
-                invPath, 
+                invPath,
                 new GZipStream(new FileStream(loadPath, FileMode.Open), CompressionMode.Decompress),
                 commsManager)
         {
         }
-        
+
         public InventoryArchiveReadRequest(
             CachedUserInfo userInfo, string invPath, Stream loadStream, CommunicationsManager commsManager)
         {
             m_userInfo = userInfo;
             m_invPath = invPath;
-            m_loadStream = loadStream;                        
+            m_loadStream = loadStream;
             this.commsManager = commsManager;
-        }        
+        }
 
         protected InventoryItemBase LoadInvItem(string contents)
         {
@@ -157,11 +157,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             int failedAssetRestores = 0;
             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), 
-                // then we'll assume that it's okay to fiddle with the user's inventory even if they are not on the 
+                // If the region server has access to the user admin service (by which users are created),
+                // then we'll assume that it's okay to fiddle with the user's inventory even if they are not on the
                 // server.
                 //
                 // FIXME: FetchInventory should probably be assumed to by async anyway, since even standalones might
@@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
 
             archive = new TarArchiveReader(m_loadStream);
-            
+
             // 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>();
@@ -200,18 +200,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             TarArchiveReader.TarEntryType entryType;
             while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
             {
-                if (entryType == TarArchiveReader.TarEntryType.TYPE_DIRECTORY) 
+                if (entryType == TarArchiveReader.TarEntryType.TYPE_DIRECTORY)
                 {
                     m_log.WarnFormat("[INVENTORY ARCHIVER]: Ignoring directory entry {0}", filePath);
-                } 
-                else if (filePath.StartsWith(InventoryArchiveConstants.ASSETS_PATH))
+                }
+                else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
                 {
                     if (LoadAsset(filePath, data))
                         successfulAssetRestores++;
                     else
                         failedAssetRestores++;
                 }
-                else if (filePath.StartsWith(InventoryArchiveConstants.INVENTORY_PATH))
+                else if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH))
                 {
                     InventoryItemBase item = LoadInvItem(m_asciiEncoding.GetString(data));
 
@@ -219,16 +219,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     {
                         // Don't use the item ID that's in the file
                         item.ID = UUID.Random();
-                        
+
                         item.Creator = m_userInfo.UserProfile.ID;
                         item.Owner = m_userInfo.UserProfile.ID;
-                        
-                        string fsPath = filePath.Substring(InventoryArchiveConstants.INVENTORY_PATH.Length);
+
+                        string fsPath = filePath.Substring(ArchiveConstants.INVENTORY_PATH.Length);
                         fsPath = fsPath.Remove(fsPath.LastIndexOf("/") + 1);
                         string originalFsPath = fsPath;
-                        
+
                         m_log.DebugFormat("[INVENTORY ARCHIVER]: Loading to folder {0}", fsPath);
-                        
+
                         InventoryFolderImpl foundFolder = null;
                         while (null == foundFolder && fsPath.Length > 0)
                         {
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                             {
                                 // Don't include the last slash
                                 int penultimateSlashIndex = fsPath.LastIndexOf("/", fsPath.Length - 2);
-                                
+
                                 if (penultimateSlashIndex >= 0)
                                 {
                                     fsPath = fsPath.Remove(penultimateSlashIndex + 1);
@@ -254,42 +254,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                                     fsPath = string.Empty;
                                     foundFolder = rootDestinationFolder;
                                 }
-                            }                           
+                            }
                         }
-                        
+
                         string fsPathSectionToCreate = originalFsPath.Substring(fsPath.Length);
-                        string[] rawDirsToCreate 
+                        string[] rawDirsToCreate
                             = fsPathSectionToCreate.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
                         int i = 0;
-                        
+
                         while (i < rawDirsToCreate.Length)
                         {
                             m_log.DebugFormat("[INVENTORY ARCHIVER]: Creating folder {0}", rawDirsToCreate[i]);
-                            
-                            int identicalNameIdentifierIndex 
+
+                            int identicalNameIdentifierIndex
                                 = rawDirsToCreate[i].LastIndexOf(
-                                    InventoryArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR); 
+                                    ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
                             string folderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
-                            
+
                             UUID newFolderId = UUID.Random();
                             m_userInfo.CreateFolder(
                                 folderName, newFolderId, (ushort)AssetType.Folder, foundFolder.ID);
                             foundFolder = foundFolder.GetChildFolder(newFolderId);
-                            
+
                             // 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;
-                            
+
                             if (0 == i)
                                 nodesLoaded.Add(foundFolder);
-                            
+
                             i++;
                         }
-                        
+
                         /*
-                        string[] rawFolders = filePath.Split(new char[] { '/' });                        
-                        
+                        string[] rawFolders = filePath.Split(new char[] { '/' });
+
                         // Find the folders that do exist along the path given
                         int i = 0;
                         bool noFolder = false;
@@ -306,27 +306,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                             else
                             {
                                 noFolder = true;
-                            }                                   
+                            }
                         }
-                        
+
                         // Create any folders that did not previously exist
                         while (i < rawFolders.Length)
                         {
                             m_log.DebugFormat("[INVENTORY ARCHIVER]: Creating folder {0}", rawFolders[i]);
-                            
+
                             UUID newFolderId = UUID.Random();
                             m_userInfo.CreateFolder(
                                 rawFolders[i++], newFolderId, (ushort)AssetType.Folder, foundFolder.ID);
                             foundFolder = foundFolder.GetChildFolder(newFolderId);
-                        } 
-                        */                       
+                        }
+                        */
 
                         // Reset folder ID to the one in which we want to load it
                         item.Folder = foundFolder.ID;
 
                         m_userInfo.AddItem(item);
                         successfulItemRestores++;
-                        
+
                         // If we're loading an item directly into the given destination folder then we need to record
                         // it separately from any loaded root folders
                         if (rootDestinationFolder == foundFolder)
@@ -339,7 +339,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             m_log.DebugFormat("[INVENTORY ARCHIVER]: Restored {0} assets", successfulAssetRestores);
             m_log.InfoFormat("[INVENTORY ARCHIVER]: Restored {0} items", successfulItemRestores);
-            
+
             return nodesLoaded;
         }
 
@@ -353,14 +353,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             //IRegionSerialiser serialiser = scene.RequestModuleInterface<IRegionSerialiser>();
             // Right now we're nastily obtaining the UUID from the filename
-            string filename = assetPath.Remove(0, InventoryArchiveConstants.ASSETS_PATH.Length);
-            int i = filename.LastIndexOf(InventoryArchiveConstants.ASSET_EXTENSION_SEPARATOR);
+            string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length);
+            int i = filename.LastIndexOf(ArchiveConstants.ASSET_EXTENSION_SEPARATOR);
 
             if (i == -1)
             {
                 m_log.ErrorFormat(
                    "[INVENTORY ARCHIVER]: Could not find extension information in asset path {0} since it's missing the separator {1}.  Skipping",
-                    assetPath, InventoryArchiveConstants.ASSET_EXTENSION_SEPARATOR);
+                    assetPath, ArchiveConstants.ASSET_EXTENSION_SEPARATOR);
 
                 return false;
             }
@@ -368,9 +368,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             string extension = filename.Substring(i);
             string uuid = filename.Remove(filename.Length - extension.Length);
 
-            if (InventoryArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension))
+            if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension))
             {
-                sbyte assetType = InventoryArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
+                sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
 
                 //m_log.DebugFormat("[INVENTORY ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);