aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-03-10 22:38:52 +0000
committerJustin Clark-Casey (justincc)2011-03-10 22:38:52 +0000
commitce4421497e47d709018e6aba9e99317d6a936b98 (patch)
treee122851dc2f42f4dbe3c375a0877b46a30da5f42 /OpenSim/Region
parentFor objects loaded from an IAR, make sure the CreatorID points towards the OS... (diff)
downloadopensim-SC_OLD-ce4421497e47d709018e6aba9e99317d6a936b98.zip
opensim-SC_OLD-ce4421497e47d709018e6aba9e99317d6a936b98.tar.gz
opensim-SC_OLD-ce4421497e47d709018e6aba9e99317d6a936b98.tar.bz2
opensim-SC_OLD-ce4421497e47d709018e6aba9e99317d6a936b98.tar.xz
re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator()
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs5
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs6
2 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index d0510d3..7d50e51 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -411,7 +411,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
411 411
412 item.CreatorIdAsUuid = ospResolvedId; 412 item.CreatorIdAsUuid = ospResolvedId;
413 413
414 // XXX: For now, don't preserve the OSPA in the creator id (which actually gets persisted to the 414 // Don't preserve the OSPA in the creator id (which actually gets persisted to the
415 // database). Instead, replace with the UUID that we found. 415 // database). Instead, replace with the UUID that we found.
416 item.CreatorId = ospResolvedId.ToString(); 416 item.CreatorId = ospResolvedId.ToString();
417 417
@@ -419,7 +419,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
419 } 419 }
420 else if (item.CreatorData == null || item.CreatorData == String.Empty) 420 else if (item.CreatorData == null || item.CreatorData == String.Empty)
421 { 421 {
422 item.CreatorIdAsUuid = m_userInfo.PrincipalID; 422 item.CreatorId = m_userInfo.PrincipalID.ToString();
423 item.CreatorIdAsUuid = new UUID(item.CreatorId);
423 } 424 }
424 425
425 item.Owner = m_userInfo.PrincipalID; 426 item.Owner = m_userInfo.PrincipalID;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 5065227..a092b65 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -236,9 +236,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
236 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name); 236 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
237 237
238 Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); 238 Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
239// Assert.That( 239 Assert.That(
240// foundItem1.CreatorId, Is.EqualTo(userUuid), 240 foundItem1.CreatorId, Is.EqualTo(m_ua1.PrincipalID.ToString()),
241// "Loaded item non-uuid creator doesn't match that of the loading user"); 241 "Loaded item non-uuid creator doesn't match that of the loading user");
242 Assert.That( 242 Assert.That(
243 foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua1.PrincipalID), 243 foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua1.PrincipalID),
244 "Loaded item uuid creator doesn't match that of the loading user"); 244 "Loaded item uuid creator doesn't match that of the loading user");