6 files changed, 271 insertions, 283 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 30eb9b8..b255415 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -111,10 +111,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected IGridService GridService
         {
-            get
-            {
-                return m_Scenes[0].GridService;
-            }
+            get { return m_Scenes[0].GridService; }
+        }
+
+        public IUserAccountService UserAccountService
+        {
+            get { return m_Scenes[0].UserAccountService; }
         }
 
         public IScene Scene
@@ -221,33 +223,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             client.OnLogout += OnLogout;
 
-            if (m_Friends.ContainsKey(client.AgentId))
+            lock (m_Friends)
             {
-                m_Friends[client.AgentId].Refcount++;
-                return;
-            }
-
-            UserFriendData newFriends = new UserFriendData();
+                if (m_Friends.ContainsKey(client.AgentId))
+                {
+                    m_Friends[client.AgentId].Refcount++;
+                    return;
+                }
 
-            newFriends.PrincipalID = client.AgentId;
-            newFriends.Friends = m_FriendsService.GetFriends(client.AgentId);
-            newFriends.Refcount = 1;
-            newFriends.RegionID = UUID.Zero;
+                UserFriendData newFriends = new UserFriendData();
 
-            m_Friends.Add(client.AgentId, newFriends);
+                newFriends.PrincipalID = client.AgentId;
+                newFriends.Friends = m_FriendsService.GetFriends(client.AgentId);
+                newFriends.Refcount = 1;
+                newFriends.RegionID = UUID.Zero;
 
+                m_Friends.Add(client.AgentId, newFriends);
+            }
+            
             //StatusChange(client.AgentId, true);
         }
 
         private void OnClientClosed(UUID agentID, Scene scene)
         {
-            if (m_Friends.ContainsKey(agentID))
-            {
-                if (m_Friends[agentID].Refcount == 1)
-                    m_Friends.Remove(agentID);
-                else
-                    m_Friends[agentID].Refcount--;
-            }
+            lock (m_Friends)
+                if (m_Friends.ContainsKey(agentID))
+                {
+                    if (m_Friends[agentID].Refcount == 1)
+                        m_Friends.Remove(agentID);
+                    else
+                        m_Friends[agentID].Refcount--;
+                }
         }
 
         private void OnLogout(IClientAPI client)
@@ -555,12 +561,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         private void OnApproveFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
         {
+            m_log.DebugFormat("[FRIENDS]: {0} accepted friendship from {1}", agentID, friendID);
+            
             FriendsService.StoreFriend(agentID, friendID.ToString(), 1);
             FriendsService.StoreFriend(friendID, agentID.ToString(), 1);
             // update the local cache
             m_Friends[agentID].Friends = FriendsService.GetFriends(agentID);
 
-            m_log.DebugFormat("[FRIENDS]: {0} accepted friendship from {1}", agentID, friendID);
 
             //
             // Notify the friend
@@ -609,7 +616,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 if (friendSession != null)
                 {
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                    m_FriendsSimConnector.FriendshipDenied(region, agentID, client.Name, friendID);
+                    if (region != null)
+                        m_FriendsSimConnector.FriendshipDenied(region, agentID, client.Name, friendID);
+                    else
+                        m_log.WarnFormat("[FRIENDS]: Could not find region {0} in locating {1}", friendSession.RegionID, friendID);
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index 0883c5b..496f2ab 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Server.Base;
 using OpenSim.Framework.Servers.HttpServer;
 using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
+using OpenSim.Services.Interfaces;
 
 using OpenMetaverse;
 using log4net;
@@ -61,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             sr.Close();
             body = body.Trim();
 
-            m_log.DebugFormat("[XXX]: query String: {0}", body);
+            //m_log.DebugFormat("[XXX]: query String: {0}", body);
 
             try
             {
@@ -115,9 +116,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             if (!UUID.TryParse(request["ToID"].ToString(), out toID))
                 return FailureResult();
 
-            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, "", toID, 
+            UserAccount account = m_FriendsModule.UserAccountService.GetUserAccount(m_FriendsModule.Scene.RegionInfo.ScopeID, fromID);
+            string name = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
+
+            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID, 
                 (byte)InstantMessageDialog.FriendshipOffered, message, false, Vector3.Zero);
-            
+
+            // !! HACK
+            im.imSessionID = im.fromAgentID;
+
             if (m_FriendsModule.LocalFriendshipOffered(toID, im))
                 return SuccessResult();
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 307db97..ab5f485 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -390,7 +390,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <returns></returns>
         protected UserAccount GetUserInfo(string firstName, string lastName, string pass)
         {
-            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName);
+            UserAccount account 
+                = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName);
+            
             if (null == account)
             {
                 m_log.ErrorFormat(
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index c81f295..507662f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -55,14 +55,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
     {
         protected ManualResetEvent mre = new ManualResetEvent(false);
         
-        private void InventoryReceived(UUID userId)
-        {
-            lock (this)
-            {
-                Monitor.PulseAll(this);
-            }
-        }
-        
         private void SaveCompleted(
             Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
             Exception reportedException)
@@ -76,11 +68,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         // Commenting for now! The mock inventory service needs more beef, at least for
         // GetFolderForType
         // REFACTORING PROBLEM. This needs to be rewritten.
-        //[Test]
+        [Test]
         public void TestSaveIarV0_1()
         {
             TestHelper.InMethod();
-            log4net.Config.XmlConfigurator.Configure();
+//            log4net.Config.XmlConfigurator.Configure();
 
             InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
 
@@ -195,189 +187,175 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         /// </summary>
         ///
         /// This test also does some deeper probing of loading into nested inventory structures
-        /// REFACTORING PROBLEM. This needs to be rewritten.
-//        [Test]
-//        public void TestLoadIarV0_1ExistingUsers()
-//        {
-//            TestHelper.InMethod();
-            
-//            //log4net.Config.XmlConfigurator.Configure();
-            
-//            string userFirstName = "Mr";
-//            string userLastName = "Tiddles";
-//            UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555");
-//            string userItemCreatorFirstName = "Lord";
-//            string userItemCreatorLastName = "Lucan";
-//            UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
-            
-//            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 = item1Name;
-//            item1.AssetID = UUID.Random();
-//            item1.GroupID = UUID.Random();
-//            item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
-//            //item1.CreatorId = userUuid.ToString();
-//            //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
-//            item1.Owner = UUID.Zero;
-            
-//            string item1FileName 
-//                = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
-//            tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
-//            tar.Close();
-
-//            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
-//            SerialiserModule serialiserModule = new SerialiserModule();
-//            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
-            
-//            // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
-//            Scene scene = SceneSetupHelpers.SetupScene("inventory");
-//            IUserAdminService userAdminService = scene.CommsManager.UserAdminService;
-            
-//            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
-//            userAdminService.AddUser(
-//                userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
-//            userAdminService.AddUser(
-//                userItemCreatorFirstName, userItemCreatorLastName, "hampshire", 
-//                String.Empty, 1000, 1000, userItemCreatorUuid);
-            
-//            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream);
-
-//            CachedUserInfo userInfo 
-//                = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
-
-//            InventoryItemBase foundItem1
-//                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, item1Name);
-            
-//            Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
-
-//// We have to disable this check since loaded items that did find users via OSPA resolution are now only storing the
-//// UUID, not the OSPA itself.
-////            Assert.That(
-////                foundItem1.CreatorId, Is.EqualTo(item1.CreatorId), 
-////                "Loaded item non-uuid creator doesn't match original");
+        [Test]
+        public void TestLoadIarV0_1ExistingUsers()
+        {
+            TestHelper.InMethod();            
+            //log4net.Config.XmlConfigurator.Configure();
+            
+            string userFirstName = "Mr";
+            string userLastName = "Tiddles";
+            UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555");
+            string userItemCreatorFirstName = "Lord";
+            string userItemCreatorLastName = "Lucan";
+            UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
+            
+            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 = item1Name;
+            item1.AssetID = UUID.Random();
+            item1.GroupID = UUID.Random();
+            item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
+            //item1.CreatorId = userUuid.ToString();
+            //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
+            item1.Owner = UUID.Zero;
+            
+            string item1FileName 
+                = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
+            tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
+            tar.Close();
+
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
+            SerialiserModule serialiserModule = new SerialiserModule();
+            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
+            
+            // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
+            Scene scene = SceneSetupHelpers.SetupScene("inventory");
+            
+            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
+                        
+                        UserProfileTestUtils.CreateUserWithInventory(
+                            scene, userFirstName, userLastName, userUuid, "meowfood");                  
+                        UserProfileTestUtils.CreateUserWithInventory(
+                            scene, userItemCreatorFirstName, userItemCreatorLastName, userItemCreatorUuid, "hampshire");
+            
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream);
+
+            InventoryItemBase foundItem1
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userUuid, item1Name);
+            
+            Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
+
+// We have to disable this check since loaded items that did find users via OSPA resolution are now only storing the
+// UUID, not the OSPA itself.
 //            Assert.That(
-//                foundItem1.CreatorId, Is.EqualTo(userItemCreatorUuid.ToString()), 
+//                foundItem1.CreatorId, Is.EqualTo(item1.CreatorId), 
 //                "Loaded item non-uuid creator doesn't match original");
+            Assert.That(
+                foundItem1.CreatorId, Is.EqualTo(userItemCreatorUuid.ToString()), 
+                "Loaded item non-uuid creator doesn't match original");
+            
+            Assert.That(
+                foundItem1.CreatorIdAsUuid, Is.EqualTo(userItemCreatorUuid), 
+                "Loaded item uuid creator doesn't match original");
+            Assert.That(foundItem1.Owner, Is.EqualTo(userUuid),
+                "Loaded item owner doesn't match inventory reciever");
+
+            // Now try loading to a root child folder
+            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userUuid, "xA");
+            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream);
+
+            InventoryItemBase foundItem2
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userUuid, "xA/" + item1Name);
+            Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2");
+
+            // Now try loading to a more deeply nested folder
+            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userUuid, "xB/xC");
+            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream);
+
+            InventoryItemBase foundItem3
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userUuid, "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);
+
+            // Create user
+            string userFirstName = "Jock";
+            string userLastName = "Stirrup";
+            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
+                        UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "meowfood");
             
-//            Assert.That(
-//                foundItem1.CreatorIdAsUuid, Is.EqualTo(userItemCreatorUuid), 
-//                "Loaded item uuid creator doesn't match original");
-//            Assert.That(foundItem1.Owner, Is.EqualTo(userUuid),
-//                "Loaded item owner doesn't match inventory reciever");
-
-//            // Now try loading to a root child folder
-//            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA");
-//            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
-//            archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream);
-
-//            InventoryItemBase foundItem2
-//                = 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
-//            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC");
-//            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
-//            archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream);
-
-//            InventoryItemBase foundItem3
-//                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + item1Name);
-//            Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
-        //}
+            // 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);
 
-        // REFACTORING PROBLEM. Needs rewrite.
-//        [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");
+                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.Name, Is.EqualTo(itemName), 
-//                "Loaded item name doesn't match saved name");
-//        }
+//                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
@@ -386,76 +364,69 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         ///
         /// This may possibly one day get overtaken by the as yet incomplete temporary profiles feature 
         /// (as tested in the a later commented out test)
-        /// REFACTORING PROBLEM. Needs rewrite.
-//        [Test]
-//        public void TestLoadIarV0_1AbsentUsers()
-//        {
-//            TestHelper.InMethod();
-            
-//            //log4net.Config.XmlConfigurator.Configure();
-            
-//            string userFirstName = "Charlie";
-//            string userLastName = "Chan";
-//            UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000999");
-//            string userItemCreatorFirstName = "Bat";
-//            string userItemCreatorLastName = "Man";
-//            //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888");
-            
-//            string itemName = "b.lsl";
-//            string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
-
-//            MemoryStream archiveWriteStream = new MemoryStream();
-//            TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-
-//            InventoryItemBase item1 = new InventoryItemBase();
-//            item1.Name = itemName;
-//            item1.AssetID = UUID.Random();
-//            item1.GroupID = UUID.Random();
-//            item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
-//            //item1.CreatorId = userUuid.ToString();
-//            //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
-//            item1.Owner = UUID.Zero;
-            
-//            string item1FileName 
-//                = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
-//            tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
-//            tar.Close();
-
-//            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
-//            SerialiserModule serialiserModule = new SerialiserModule();
-//            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
-            
-//            // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
-//            Scene scene = SceneSetupHelpers.SetupScene("inventory");
-//            IUserAdminService userAdminService = scene.CommsManager.UserAdminService;
-            
-//            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
-//            userAdminService.AddUser(
-//                userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
-            
-//            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream);
-
-//            CachedUserInfo userInfo 
-//                = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
-
-//            InventoryItemBase foundItem1
-//                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, itemName);
-            
-//            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");
+        /// This test is currently disabled 
+        [Test]
+        public void TestLoadIarV0_1AbsentUsers()
+        {
+            TestHelper.InMethod();            
+            //log4net.Config.XmlConfigurator.Configure();
+            
+            string userFirstName = "Charlie";
+            string userLastName = "Chan";
+            UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000999");
+            string userItemCreatorFirstName = "Bat";
+            string userItemCreatorLastName = "Man";
+            //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888");
+            
+            string itemName = "b.lsl";
+            string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
+
+            MemoryStream archiveWriteStream = new MemoryStream();
+            TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
+
+            InventoryItemBase item1 = new InventoryItemBase();
+            item1.Name = itemName;
+            item1.AssetID = UUID.Random();
+            item1.GroupID = UUID.Random();
+            item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
+            //item1.CreatorId = userUuid.ToString();
+            //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
+            item1.Owner = UUID.Zero;
+            
+            string item1FileName 
+                = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
+            tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
+            tar.Close();
+
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
+            SerialiserModule serialiserModule = new SerialiserModule();
+            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
+            
+            // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
+            Scene scene = SceneSetupHelpers.SetupScene("inventory");
+            
+            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
+                        UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userUuid, "meowfood");
+            
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream);
+
+            InventoryItemBase foundItem1
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userUuid, itemName);
+            
+            Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
 //            Assert.That(
-//                foundItem1.CreatorIdAsUuid, Is.EqualTo(userUuid), 
-//                "Loaded item uuid creator doesn't match that of the loading user");
-//        }
+//                foundItem1.CreatorId, Is.EqualTo(userUuid), 
+//                "Loaded item non-uuid creator doesn't match that of the loading user");
+            Assert.That(
+                foundItem1.CreatorIdAsUuid, Is.EqualTo(userUuid), 
+                "Loaded item uuid creator doesn't match that of the loading user");
+        }
 
         /// <summary>
         /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
         /// no account exists with the creator name
         /// </summary>
         /// Disabled since temporary profiles have not yet been implemented.
-        /// REFACTORING PROBLEM. Needs rewrite.
         /// 
         //[Test]
         //public void TestLoadIarV0_1TempProfiles()
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index a355661..e1bc243 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -44,10 +44,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         public UserAccountCache()
         {
-            // Warning: the size values are a bit fuzzy. What matters
-            // most for this cache is the count value (128 entries).
             m_UUIDCache = new ExpiringCache<UUID, UserAccount>();
-            m_NameCache = new ExpiringCache<string, UUID>(); // this one is unbound
+            m_NameCache = new ExpiringCache<string, UUID>(); 
         }
 
         public void Cache(UUID userID, UserAccount account)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 4d04af1..58698ee 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             SerialiserModule serialiserModule = new SerialiserModule();
             TerrainModule terrainModule = new TerrainModule();
 
-            m_scene = SceneSetupHelpers.SetupScene("useraccounts");
+            m_scene = SceneSetupHelpers.SetupScene();
             SceneSetupHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
         }