4 files changed, 299 insertions, 135 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index f761bf0..aafcfa2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -99,36 +99,6 @@ 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
-                // server.
-                //
-                // 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_scene.CommsManager.UserAdminService)
-                {
-                    m_log.ErrorFormat(
-                        "[INVENTORY ARCHIVER]: Have not yet received inventory info for user {0} {1}",
-                        m_userInfo.UserProfile.Name, m_userInfo.UserProfile.ID);
-
-                    return nodesLoaded;
-                }
-                else
-                {
-                    m_userInfo.FetchInventory();
-                    for (int i = 0 ; i < 50 ; i++)
-                    {
-                        if (m_userInfo.HasReceivedInventory == true)
-                            break;
-                        Thread.Sleep(200);
-                    }
-                }
-            }
-            */
            
             //InventoryFolderImpl rootDestinationFolder = m_userInfo.RootFolder.FindFolderByPath(m_invPath);
             InventoryFolderBase rootDestinationFolder 
@@ -159,9 +129,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         successfulAssetRestores++;
                     else
                         failedAssetRestores++;
+
+                    if ((successfulAssetRestores) % 50 == 0)
+                        m_log.DebugFormat(
+                            "[INVENTORY ARCHIVER]: Loaded {0} assets...", 
+                            successfulAssetRestores);
                 }
                 else if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH))
-                {
+                {                                
                     InventoryFolderBase foundFolder 
                         = ReplicateArchivePathToUserInventory(
                             filePath, TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType, 
@@ -169,38 +144,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                     if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY != entryType)
                     {
-                        InventoryItemBase item = UserInventoryItemSerializer.Deserialize(data);
-                        
-                        // Don't use the item ID that's in the file
-                        item.ID = UUID.Random();
-
-                        UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.CommsManager); 
-                        if (UUID.Zero != ospResolvedId)
-                            item.CreatorIdAsUuid = ospResolvedId;
-                        else
-                            item.CreatorIdAsUuid = m_userInfo.UserProfile.ID;
-                        
-                        item.Owner = m_userInfo.UserProfile.ID;
-
-                        // Reset folder ID to the one in which we want to load it
-                        item.Folder = foundFolder.ID;
+                        InventoryItemBase item = LoadItem(data, foundFolder);
 
-                        //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
-                        // it separately from any loaded root folders
-                        if (rootDestinationFolder == foundFolder)
-                            nodesLoaded.Add(item);
+                        if (item != null)
+                        {
+                            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)
+                                nodesLoaded.Add(item);
+                        }
                     }
                 }
             }
 
             archive.Close();
 
-            m_log.DebugFormat("[INVENTORY ARCHIVER]: Restored {0} assets", successfulAssetRestores);
-            m_log.InfoFormat("[INVENTORY ARCHIVER]: Restored {0} items", successfulItemRestores);
+            m_log.DebugFormat(
+                "[INVENTORY ARCHIVER]: Successfully loaded {0} assets with {1} failures", 
+                successfulAssetRestores, failedAssetRestores);
+            m_log.InfoFormat("[INVENTORY ARCHIVER]: Successfully loaded {0} items", successfulItemRestores);
 
             return nodesLoaded;
         }
@@ -234,8 +198,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             string originalArchivePath = archivePath;
 
-            m_log.DebugFormat(
-                "[INVENTORY ARCHIVER]: Loading to folder {0} {1}", rootDestFolder.Name, rootDestFolder.ID);
+//            m_log.DebugFormat(
+//                "[INVENTORY ARCHIVER]: Loading folder {0} {1}", rootDestFolder.Name, rootDestFolder.ID);
 
             InventoryFolderBase destFolder = null;
 
@@ -246,8 +210,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 {
                     if (foldersCreated.ContainsKey(archivePath))
                     {
-                        m_log.DebugFormat(
-                            "[INVENTORY ARCHIVER]: Found previously created folder from archive path {0}", archivePath);
+//                        m_log.DebugFormat(
+//                            "[INVENTORY ARCHIVER]: Found previously created folder from archive path {0}", archivePath);
                         destFolder = foldersCreated[archivePath];
                     }
                     else
@@ -289,6 +253,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
 
                 string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
+
+                newFolderName = InventoryArchiveUtils.UnescapeArchivePath(newFolderName);                
                 UUID newFolderId = UUID.Random();
 
                 // Asset type has to be Unknown here rather than Folder, otherwise the created folder can't be
@@ -361,6 +327,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         /// <summary>
+        /// Load an item from the archive
+        /// </summary>
+        /// <param name="filePath">The archive path for the item</param>
+        /// <param name="data">The raw item data</param>
+        /// <param name="rootDestinationFolder">The root destination folder for loaded items</param>
+        /// <param name="nodesLoaded">All the inventory nodes (items and folders) loaded so far</param>
+        protected InventoryItemBase LoadItem(byte[] data, InventoryFolderBase loadFolder)
+        {
+            InventoryItemBase item = UserInventoryItemSerializer.Deserialize(data);
+            
+            // Don't use the item ID that's in the file
+            item.ID = UUID.Random();
+
+            UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.CommsManager); 
+            if (UUID.Zero != ospResolvedId)
+                item.CreatorIdAsUuid = ospResolvedId;
+            else
+                item.CreatorIdAsUuid = m_userInfo.UserProfile.ID;
+            
+            item.Owner = m_userInfo.UserProfile.ID;
+
+            // Reset folder ID to the one in which we want to load it
+            item.Folder = loadFolder.ID;
+
+            //m_userInfo.AddItem(item);
+            m_scene.InventoryService.AddItem(item);            
+        
+            return item;
+        }
+
+        /// <summary>
         /// Load an asset
         /// </summary>
         /// <param name="assetFilename"></param>
@@ -389,11 +386,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             {
                 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
 
-                //m_log.DebugFormat("[INVENTORY ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
+                if (assetType == (sbyte)AssetType.Unknown)
+                    m_log.WarnFormat("[INVENTORY ARCHIVER]: Importing {0} byte asset {1} with unknown type", data.Length, uuid);
 
-                AssetBase asset = new AssetBase(new UUID(uuid), "RandomName");
+                //m_log.DebugFormat("[INVENTORY ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
 
-                asset.Type = assetType;
+                AssetBase asset = new AssetBase(new UUID(uuid), "RandomName", assetType);
                 asset.Data = data;
 
                 m_scene.AssetService.Store(asset);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
index a822d10..247cee4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
@@ -27,6 +27,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
@@ -38,7 +41,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
     /// </summary>
     public static class InventoryArchiveUtils
     {
-        public static readonly string PATH_DELIMITER = "/";
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        // Character used for escaping the path delimter ("\/") and itself ("\\") in human escaped strings
+        public static readonly char ESCAPE_CHARACTER = '\\';
+
+        // The character used to separate inventory path components (different folders and items)
+        public static readonly char PATH_DELIMITER = '/';
 
         /// <summary>
         /// Find a folder given a PATH_DELIMITER delimited path starting from a user's root folder
@@ -103,10 +112,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             path = path.Trim();
 
-            if (path == PATH_DELIMITER)
+            if (path == PATH_DELIMITER.ToString())
                 return startFolder;
 
-            string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
+            string[] components = SplitEscapedPath(path);
+            components[0] = UnescapePath(components[0]);            
+
+            //string[] components = path.Split(new string[] { PATH_DELIMITER.ToString() }, 2, StringSplitOptions.None);
+            
             InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);
 
             foreach (InventoryFolderBase folder in contents.Folders)
@@ -181,10 +194,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         public static InventoryItemBase FindItemByPath(
             IInventoryService inventoryService, InventoryFolderBase startFolder, string path)
         {
-            string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
+            string[] components = SplitEscapedPath(path);
+            components[0] = UnescapePath(components[0]);
+                            
+            //string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
 
             if (components.Length == 1)
             {
+//                m_log.DebugFormat("FOUND SINGLE COMPONENT [{0}]", components[0]);
+                
                 List<InventoryItemBase> items = inventoryService.GetFolderItems(startFolder.Owner, startFolder.ID);
                 foreach (InventoryItemBase item in items)
                 {
@@ -194,6 +212,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
             else
             {
+//                m_log.DebugFormat("FOUND COMPONENTS [{0}] and [{1}]", components[0], components[1]);
+                
                 InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID);
                 
                 foreach (InventoryFolderBase folder in contents.Folders)
@@ -206,5 +226,97 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             // We didn't find an item or intermediate folder with the given name
             return null;
         }
+
+        /// <summary>
+        /// Split a human escaped path into two components if it contains an unescaped path delimiter, or one component
+        /// if no delimiter is present
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns>
+        /// The split path.  We leave the components in their originally unescaped state (though we remove the delimiter
+        /// which originally split them if applicable).
+        /// </returns>
+        public static string[] SplitEscapedPath(string path)
+        {
+//            m_log.DebugFormat("SPLITTING PATH {0}", path);
+            
+            bool singleEscapeChar = false;
+            
+            for (int i = 0; i < path.Length; i++)
+            {
+                if (path[i] == ESCAPE_CHARACTER && !singleEscapeChar)
+                {
+                    singleEscapeChar = true;
+                }
+                else
+                {
+                    if (PATH_DELIMITER == path[i] && !singleEscapeChar)
+                        return new string[2] { path.Remove(i), path.Substring(i + 1) };
+                    else
+                        singleEscapeChar = false;
+                }
+            }
+
+            // We didn't find a delimiter
+            return new string[1] { path };
+        }
+
+        /// <summary>
+        /// Unescapes a human escaped path.  This means that "\\" goes to "\", and "\/" goes to "/"
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static string UnescapePath(string path)
+        {
+//            m_log.DebugFormat("ESCAPING PATH {0}", path);
+            
+            StringBuilder sb = new StringBuilder();
+
+            bool singleEscapeChar = false;
+            for (int i = 0; i < path.Length; i++)
+            {
+                if (path[i] == ESCAPE_CHARACTER && !singleEscapeChar)
+                    singleEscapeChar = true;
+                else
+                    singleEscapeChar = false;
+
+                if (singleEscapeChar)
+                {
+                    if (PATH_DELIMITER == path[i])
+                        sb.Append(PATH_DELIMITER);
+                }
+                else
+                {
+                    sb.Append(path[i]);
+                }
+            }
+
+//            m_log.DebugFormat("ESCAPED PATH TO {0}", sb);
+            
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Escape an archive path.
+        /// </summary>
+        /// This has to be done differently from human paths because we can't leave in any "/" characters (due to
+        /// problems if the archive is built from or extracted to a filesystem
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static string EscapeArchivePath(string path)
+        {
+            // Only encode ampersands (for escaping anything) and / (since this is used as general dir separator).
+            return path.Replace("&", "&amp;").Replace("/", "&#47;");            
+        }
+
+        /// <summary>
+        /// Unescape an archive path.
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>        
+        public static string UnescapeArchivePath(string path)
+        {
+            return path.Replace("&#47;", "/").Replace("&amp;", "&");            
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 499c552..bbb49f6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -217,37 +217,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             InventoryItemBase inventoryItem = null;
             InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.UserProfile.ID);
 
-            // XXX: Very temporarily, drop and refetch inventory to make sure we have any newly created items in cache
-            // This will disappear very soon once we stop using the old cached inventory.
-            /*
-            m_userInfo.DropInventory();
-            m_userInfo.FetchInventory();
-            */
-
-            /*
-            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
-                // server.
-                //
-                // 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_scene.CommsManager.UserAdminService)
-                {
-                    m_log.ErrorFormat(
-                        "[INVENTORY ARCHIVER]: Have not yet received inventory info for user {0} {1}",
-                        m_userInfo.UserProfile.Name, m_userInfo.UserProfile.ID);
-
-                    return;
-                }
-                else
-                {
-                    m_userInfo.FetchInventory();
-                }
-            }
-            */
-
             bool foundStar = false;
 
             // Eliminate double slashes and any leading / on the path.
@@ -294,34 +263,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             m_archiveWriter = new TarArchiveWriter(m_saveStream);
 
-            if (null == inventoryFolder)
-            {
-                if (null == inventoryItem)
-                {
-                    // We couldn't find the path indicated 
-                    m_saveStream.Close();
-                    m_module.TriggerInventoryArchiveSaved(
-                        m_id, false, m_userInfo, m_invPath, m_saveStream,
-                        new Exception(string.Format("Could not find inventory entry at path {0}", m_invPath)));
-                    return;
-                }
-                else
-                {
-                    m_log.DebugFormat(
-                        "[INVENTORY ARCHIVER]: Found item {0} {1} at {2}",
-                        inventoryItem.Name, inventoryItem.ID, m_invPath);
-
-                    SaveInvItem(inventoryItem, ArchiveConstants.INVENTORY_PATH);
-                }
-            }
-            else
+            if (inventoryFolder != null)
             {
                 m_log.DebugFormat(
                     "[INVENTORY ARCHIVER]: Found folder {0} {1} at {2}",
                     inventoryFolder.Name, inventoryFolder.ID, m_invPath);
 
                 //recurse through all dirs getting dirs and files
-                SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH, !foundStar);
+                SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH, !foundStar);                                
+            }
+            else if (inventoryItem != null)
+            {
+                m_log.DebugFormat(
+                    "[INVENTORY ARCHIVER]: Found item {0} {1} at {2}",
+                    inventoryItem.Name, inventoryItem.ID, m_invPath);
+
+                SaveInvItem(inventoryItem, ArchiveConstants.INVENTORY_PATH);                
+            }
+            else
+            {
+                // We couldn't find the path indicated 
+                m_saveStream.Close();
+                string errorMessage = string.Format("Aborted save.  Could not find inventory path {0}", m_invPath);
+                m_log.ErrorFormat("[INVENTORY ARCHIVER]: {0}", errorMessage);
+                m_module.TriggerInventoryArchiveSaved(
+                    m_id, false, m_userInfo, m_invPath, m_saveStream,
+                    new Exception(errorMessage));                
+                return;
             }
 
             // Don't put all this profile information into the archive right now.
@@ -396,7 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             return string.Format(
                 "{0}{1}{2}/",
-                name,
+                InventoryArchiveUtils.EscapeArchivePath(name),
                 ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR,
                 id);
         }
@@ -411,7 +379,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             return string.Format(
                 "{0}{1}{2}.xml",
-                name,
+                InventoryArchiveUtils.EscapeArchivePath(name),
                 ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR,
                 id);
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index b0fdcd6..f8a010c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using System.Text;
 using System.Threading;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
@@ -122,9 +121,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             }
 
             UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
-            AssetBase asset1 = new AssetBase();
-            asset1.FullID = asset1Id;
-            asset1.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(object1));
+            AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
             scene.AssetService.Store(asset1);
 
             // Create item
@@ -136,7 +133,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             InventoryFolderBase objsFolder 
                 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects");
             item1.Folder = objsFolder.ID;
-            scene.AddInventoryItem(userId, item1);
+            scene.AddInventoryItem(userId, item1);           
 
             MemoryStream archiveWriteStream = new MemoryStream();
             archiverModule.OnInventoryArchiveSaved += SaveCompleted;
@@ -218,14 +215,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string userItemCreatorLastName = "Lucan";
             UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
             
-            string itemName = "b.lsl";
-            string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
+            string item1Name = "b.lsl";
+            string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1Name, UUID.Random());
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
 
             InventoryItemBase item1 = new InventoryItemBase();
-            item1.Name = itemName;
+            item1.Name = item1Name;
             item1.AssetID = UUID.Random();
             item1.GroupID = UUID.Random();
             item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
@@ -259,7 +256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
 
             InventoryItemBase foundItem1
-                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, itemName);
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, item1Name);
             
             Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
             Assert.That(
@@ -277,7 +274,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream);
 
             InventoryItemBase foundItem2
-                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xA/" + itemName);
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xA/" + item1Name);
             Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2");
 
             // Now try loading to a more deeply nested folder
@@ -286,10 +283,99 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream);
 
             InventoryItemBase foundItem3
-                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + itemName);
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + item1Name);
             Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
         }
 
+        [Test]
+        public void TestIarV0_1WithEscapedChars()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            string itemName = "You & you are a mean/man/";
+            string humanEscapedItemName = @"You & you are a mean\/man\/";
+            string userPassword = "meowfood";
+
+            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
+
+            Scene scene = SceneSetupHelpers.SetupScene("Inventory");
+            SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
+            CommunicationsManager cm = scene.CommsManager;
+
+            // Create user
+            string userFirstName = "Jock";
+            string userLastName = "Stirrup";
+            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
+
+            lock (this)
+            {
+                UserProfileTestUtils.CreateUserWithInventory(
+                    cm, userFirstName, userLastName, userPassword, userId, InventoryReceived);
+                Monitor.Wait(this, 60000);
+            }
+            
+            // Create asset
+            SceneObjectGroup object1;
+            SceneObjectPart part1;
+            {
+                string partName = "part name";
+                UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
+                PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
+                Vector3 groupPosition = new Vector3(10, 20, 30);
+                Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
+                Vector3 offsetPosition = new Vector3(5, 10, 15);
+
+                part1
+                    = new SceneObjectPart(
+                        ownerId, shape, groupPosition, rotationOffset, offsetPosition);
+                part1.Name = partName;
+
+                object1 = new SceneObjectGroup(part1);
+                scene.AddNewSceneObject(object1, false);
+            }
+
+            UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
+            AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
+            scene.AssetService.Store(asset1);
+
+            // Create item
+            UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
+            InventoryItemBase item1 = new InventoryItemBase();
+            item1.Name = itemName;
+            item1.AssetID = asset1.FullID;
+            item1.ID = item1Id;
+            InventoryFolderBase objsFolder 
+                = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects");
+            item1.Folder = objsFolder.ID;
+            scene.AddInventoryItem(userId, item1);           
+
+            MemoryStream archiveWriteStream = new MemoryStream();
+            archiverModule.OnInventoryArchiveSaved += SaveCompleted;
+
+            mre.Reset();
+            archiverModule.ArchiveInventory(
+                Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
+            mre.WaitOne(60000, false);           
+
+            // LOAD ITEM
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
+            
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream);
+
+            InventoryItemBase foundItem1
+                = InventoryArchiveUtils.FindItemByPath(
+                    scene.InventoryService, userId, "Scripts/Objects/" + humanEscapedItemName);
+            
+            Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
+//            Assert.That(
+//                foundItem1.CreatorId, Is.EqualTo(userUuid), 
+//                "Loaded item non-uuid creator doesn't match that of the loading user");
+            Assert.That(
+                foundItem1.Name, Is.EqualTo(itemName), 
+                "Loaded item name doesn't match saved name");            
+        }
+
         /// <summary>
         /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
         /// embedded creators do not exist in the system
@@ -302,7 +388,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelper.InMethod();
             
-            log4net.Config.XmlConfigurator.Configure();
+            //log4net.Config.XmlConfigurator.Configure();
             
             string userFirstName = "Charlie";
             string userLastName = "Chan";
@@ -370,7 +456,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         {
             TestHelper.InMethod();
             
-            log4net.Config.XmlConfigurator.Configure();
+            //log4net.Config.XmlConfigurator.Configure();
             
             string userFirstName = "Dennis";
             string userLastName = "Menace";