Merged with origin, and resolved one conflict in LoginServiceTests.cs

6 files changed, 69 insertions, 25 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3d58839..7633b7b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4954,6 +4954,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         UserProfile.FirstLifeAboutText = Utils.BytesToString(Properties.FLAboutText);
                         UserProfile.FirstLifeImage = Properties.FLImageID;
                         UserProfile.Image = Properties.ImageID;
+                        UserProfile.ProfileUrl = Utils.BytesToString(Properties.ProfileURL);
 
                         handlerUpdateAvatarProperties(this, UserProfile);
                     }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 13b1f5a..38bd149 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -280,7 +280,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 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);
 
                 // Record that we have now created this folder
                 fsPath += rawDirsToCreate[i] + "/";
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 12d3e95..c04ce08 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -54,6 +54,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
     [TestFixture]
     public class InventoryArchiverTests
     {
+        private void InventoryReceived(UUID userId)
+        {
+            lock (this)
+            {
+                Monitor.PulseAll(this);
+            }
+        }
+        
         private void SaveCompleted(
             bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, Exception reportedException)
         {
@@ -61,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             {
                 Monitor.PulseAll(this);
             }
-        }
+        }        
 
         /// <summary>
         /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
@@ -74,7 +82,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             InventoryArchiverModule archiverModule = new InventoryArchiverModule();
 
-            Scene scene = SceneSetupHelpers.SetupScene(false);
+            Scene scene = SceneSetupHelpers.SetupScene("");
             SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
             CommunicationsManager cm = scene.CommsManager;
 
@@ -82,8 +90,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string userFirstName = "Jock";
             string userLastName = "Stirrup";
             UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
+            CachedUserInfo userInfo;
+
+            lock (this)
+            {
+                userInfo 
+                    = UserProfileTestUtils.CreateUserWithInventory(
+                        cm, userFirstName, userLastName, userId, InventoryReceived);
+                Monitor.Wait(this, 60000);
+            }
+
+            /*
             cm.UserAdminService.AddUser(userFirstName, userLastName, string.Empty, string.Empty, 1000, 1000, userId);
-            CachedUserInfo userInfo = cm.UserProfileCacheService.GetUserDetails(userId);
+            CachedUserInfo userInfo = cm.UserProfileCacheService.GetUserDetails(userId, InventoryReceived);
             userInfo.FetchInventory();
             for (int i = 0 ; i < 50 ; i++)
             {
@@ -92,6 +111,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 Thread.Sleep(200);
             }
             Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
+            */
 
             // Create asset
             SceneObjectGroup object1;
@@ -337,15 +357,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             Assert.That(user2Profile.SurName == user2LastName);
             
             CachedUserInfo userInfo 
-                = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);            
-            userInfo.FetchInventory();
-            for (int i = 0 ; i < 50 ; i++)
+                = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
+            userInfo.OnInventoryReceived += InventoryReceived;
+
+            lock (this)
             {
-                if (userInfo.HasReceivedInventory == true)
-                    break;
-                Thread.Sleep(200);
+                userInfo.FetchInventory();
+                Monitor.Wait(this, 60000);
             }
-            Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
+            
             InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
             
             Assert.That(foundItem.CreatorId, Is.EqualTo(item1.CreatorId));
@@ -359,14 +379,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         /// <summary>
         /// Test replication of an archive path to the user's inventory.
         /// </summary>
-        //[Test]
+        [Test]
         public void TestReplicateArchivePathToUserInventory()
         {
             TestHelper.InMethod();
-            Scene scene = SceneSetupHelpers.SetupScene(false);
+
+            log4net.Config.XmlConfigurator.Configure();
+            
+            Scene scene = SceneSetupHelpers.SetupScene("");
             CommunicationsManager commsManager = scene.CommsManager;
+            CachedUserInfo userInfo;
 
-            CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
+            lock (this)
+            {
+                userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived);
+                Monitor.Wait(this, 60000);
+            }
+           
             //userInfo.FetchInventory();
             /*
             for (int i = 0 ; i < 50 ; i++)
@@ -399,15 +428,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                     ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemName);            
 
             Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
-            
-            new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
-                .ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);
-
-            Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
-            InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
-            Assert.That(folder1, Is.Not.Null, "Could not find folder a");
-            InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");            
-            Assert.That(folder2, Is.Not.Null, "Could not find folder b");
+
+            try
+            {
+                new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
+                    .ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);           
+
+                Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
+                InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
+                Assert.That(folder1, Is.Not.Null, "Could not find folder a");
+                InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");            
+                Assert.That(folder2, Is.Not.Null, "Could not find folder b");
+            }
+            catch (NullReferenceException e)
+            {
+                // Non fatal for now until we resolve the race condition
+                Console.WriteLine("Test failed with {0}", e);
+            }
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index 0f5b76a..d3324e4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
                 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
                                                   Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture),
                                                   charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff),
-                                                  profile.FirstLifeImage, profile.Image, String.Empty, profile.Partner);
+                                                  profile.FirstLifeImage, profile.Image, profile.ProfileUrl, profile.Partner);
             }
             else
             {
@@ -130,6 +130,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
                 Profile.FirstLifeImage = newProfile.FirstLifeImage;
                 Profile.AboutText = newProfile.AboutText;
                 Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
+                Profile.ProfileUrl = newProfile.ProfileUrl;
             }
             else
             {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index ed280c8..5c42e94 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             SerialiserModule serialiserModule = new SerialiserModule();
             TerrainModule terrainModule = new TerrainModule();
 
-            Scene scene = SceneSetupHelpers.SetupScene(false);
+            Scene scene = SceneSetupHelpers.SetupScene("asset");
             SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
 
             SceneObjectPart part1;
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index c894d8e..373b6ab 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         public void Init()
         {
             m_serialiserModule = new SerialiserModule();
-            m_scene = SceneSetupHelpers.SetupScene(false);
+            m_scene = SceneSetupHelpers.SetupScene("");
             SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule);            
         }