aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
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/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
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 '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs5
1 files changed, 3 insertions, 2 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;