diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 55 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | 9 |
2 files changed, 23 insertions, 41 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 28b4d64..470a386 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). | 75 | /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). |
76 | /// </summary> | 76 | /// </summary> |
77 | //[Test] | 77 | [Test] |
78 | public void TestSaveIarV0_1() | 78 | public void TestSaveIarV0_1() |
79 | { | 79 | { |
80 | TestHelper.InMethod(); | 80 | TestHelper.InMethod(); |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
82 | 82 | ||
83 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); | 83 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
84 | 84 | ||
85 | Scene scene = SceneSetupHelpers.SetupScene(""); | 85 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); |
86 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); | 86 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); |
87 | CommunicationsManager cm = scene.CommsManager; | 87 | CommunicationsManager cm = scene.CommsManager; |
88 | 88 | ||
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
222 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where | 222 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where |
223 | /// an account exists with the creator name. | 223 | /// an account exists with the creator name. |
224 | /// </summary> | 224 | /// </summary> |
225 | //[Test] | 225 | [Test] |
226 | public void TestLoadIarV0_1ExistingUsers() | 226 | public void TestLoadIarV0_1ExistingUsers() |
227 | { | 227 | { |
228 | TestHelper.InMethod(); | 228 | TestHelper.InMethod(); |
@@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
262 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); | 262 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
263 | 263 | ||
264 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene | 264 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene |
265 | Scene scene = SceneSetupHelpers.SetupScene(); | 265 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); |
266 | IUserAdminService userAdminService = scene.CommsManager.UserAdminService; | 266 | IUserAdminService userAdminService = scene.CommsManager.UserAdminService; |
267 | 267 | ||
268 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); | 268 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
@@ -276,16 +276,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
276 | 276 | ||
277 | CachedUserInfo userInfo | 277 | CachedUserInfo userInfo |
278 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); | 278 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); |
279 | //userInfo.FetchInventory(); | 279 | |
280 | /* | ||
281 | for (int i = 0 ; i < 50 ; i++) | ||
282 | { | ||
283 | if (userInfo.HasReceivedInventory == true) | ||
284 | break; | ||
285 | Thread.Sleep(200); | ||
286 | } | ||
287 | Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)"); | ||
288 | */ | ||
289 | InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); | 280 | InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); |
290 | Assert.That(foundItem, Is.Not.Null, "Didn't find loaded item"); | 281 | Assert.That(foundItem, Is.Not.Null, "Didn't find loaded item"); |
291 | Assert.That( | 282 | Assert.That( |
@@ -395,17 +386,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
395 | userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived); | 386 | userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived); |
396 | Monitor.Wait(this, 60000); | 387 | Monitor.Wait(this, 60000); |
397 | } | 388 | } |
398 | |||
399 | //userInfo.FetchInventory(); | ||
400 | /* | ||
401 | for (int i = 0 ; i < 50 ; i++) | ||
402 | { | ||
403 | if (userInfo.HasReceivedInventory == true) | ||
404 | break; | ||
405 | Thread.Sleep(200); | ||
406 | } | ||
407 | Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)"); | ||
408 | */ | ||
409 | 389 | ||
410 | Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder); | 390 | Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder); |
411 | 391 | ||
@@ -429,22 +409,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
429 | 409 | ||
430 | Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder); | 410 | Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder); |
431 | 411 | ||
432 | try | 412 | new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null) |
433 | { | 413 | .ReplicateArchivePathToUserInventory( |
434 | new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null) | 414 | itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded); |
435 | .ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded); | 415 | |
436 | 416 | Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder); | |
437 | Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder); | 417 | InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a"); |
438 | InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a"); | 418 | Assert.That(folder1, Is.Not.Null, "Could not find folder a"); |
439 | Assert.That(folder1, Is.Not.Null, "Could not find folder a"); | 419 | InventoryFolderImpl folder2 = folder1.FindFolderByPath("b"); |
440 | InventoryFolderImpl folder2 = folder1.FindFolderByPath("b"); | 420 | Assert.That(folder2, Is.Not.Null, "Could not find folder b"); |
441 | Assert.That(folder2, Is.Not.Null, "Could not find folder b"); | ||
442 | } | ||
443 | catch (NullReferenceException e) | ||
444 | { | ||
445 | // Non fatal for now until we resolve the race condition | ||
446 | Console.WriteLine("Test failed with {0}", e); | ||
447 | } | ||
448 | } | 421 | } |
449 | } | 422 | } |
450 | } | 423 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index d3324e4..0f58788 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
29 | using System.Globalization; | 30 | using System.Globalization; |
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using log4net; | 32 | using log4net; |
@@ -41,6 +42,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
41 | { | 42 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | private Scene m_scene; | 44 | private Scene m_scene; |
45 | private IProfileModule m_profileModule = null; | ||
44 | 46 | ||
45 | public AvatarProfilesModule() | 47 | public AvatarProfilesModule() |
46 | { | 48 | { |
@@ -56,6 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
56 | 58 | ||
57 | public void PostInitialise() | 59 | public void PostInitialise() |
58 | { | 60 | { |
61 | m_profileModule = m_scene.RequestModuleInterface<IProfileModule>(); | ||
59 | } | 62 | } |
60 | 63 | ||
61 | public void Close() | 64 | public void Close() |
@@ -108,6 +111,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles | |||
108 | charterMember = Utils.StringToBytes(profile.CustomType); | 111 | charterMember = Utils.StringToBytes(profile.CustomType); |
109 | } | 112 | } |
110 | 113 | ||
114 | if (m_profileModule != null) | ||
115 | { | ||
116 | Hashtable profileData = m_profileModule.GetProfileData(remoteClient.AgentId); | ||
117 | if (profileData["ProfileUrl"] != null) | ||
118 | profile.ProfileUrl = profileData["ProfileUrl"].ToString(); | ||
119 | } | ||
111 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, | 120 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, |
112 | Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture), | 121 | Util.ToDateTime(profile.Created).ToString("M/d/yyyy", CultureInfo.InvariantCulture), |
113 | charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff), | 122 | charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff), |