From a61cbab799886e43749bc4d0803e579fec000f4c Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 4 May 2009 16:15:30 +0000
Subject: * Insert profile references for creators for items saved into iars

---
 .../Inventory/Archiver/InventoryArchiveReadRequest.cs       |  2 +-
 .../Inventory/Archiver/InventoryArchiveWriteRequest.cs      | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 75e39d1..d9c154a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         // Don't use the item ID that's in the file
                         item.ID = UUID.Random();
 
-                        string ospResolvedId = OspResolver.Resolve(item.CreatorId, m_commsManager); 
+                        string ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_commsManager); 
                         if (null != ospResolvedId)
                             item.CreatorId = ospResolvedId;
                         
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 0144136..4747f1f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -125,13 +125,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             string filename = string.Format("{0}{1}_{2}.xml", path, inventoryItem.Name, inventoryItem.ID);            
 			
-            string serialization = UserInventoryItemSerializer.Serialize(inventoryItem);
-            m_archive.WriteFile(filename, serialization);
-            
             // Record the creator of this item for user record purposes (which might go away soon)
             m_userUuids[inventoryItem.CreatorIdAsUuid] = 1;
-
-            m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids);
+			
+            InventoryItemBase saveItem = (InventoryItemBase)inventoryItem.Clone();
+            saveItem.CreatorId = OspResolver.MakeOspa(saveItem.CreatorIdAsUuid, m_module.CommsManager);
+			
+            string serialization = UserInventoryItemSerializer.Serialize(saveItem);
+            m_archive.WriteFile(filename, serialization);
+            
+            m_assetGatherer.GatherAssetUuids(saveItem.AssetID, (AssetType)saveItem.AssetType, m_assetUuids);
         }
 
         /// <summary>
-- 
cgit v1.1