aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-04 16:15:30 +0000
committerJustin Clarke Casey2009-05-04 16:15:30 +0000
commita61cbab799886e43749bc4d0803e579fec000f4c (patch)
treebe4e32c991268d54c7d6b2d70edd49ac9c816265 /OpenSim/Region
parent* minor: remove some mono compiler warnings, minor cleanup (diff)
downloadopensim-SC_OLD-a61cbab799886e43749bc4d0803e579fec000f4c.zip
opensim-SC_OLD-a61cbab799886e43749bc4d0803e579fec000f4c.tar.gz
opensim-SC_OLD-a61cbab799886e43749bc4d0803e579fec000f4c.tar.bz2
opensim-SC_OLD-a61cbab799886e43749bc4d0803e579fec000f4c.tar.xz
* Insert profile references for creators for items saved into iars
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs13
2 files changed, 9 insertions, 6 deletions
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
156 // Don't use the item ID that's in the file 156 // Don't use the item ID that's in the file
157 item.ID = UUID.Random(); 157 item.ID = UUID.Random();
158 158
159 string ospResolvedId = OspResolver.Resolve(item.CreatorId, m_commsManager); 159 string ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_commsManager);
160 if (null != ospResolvedId) 160 if (null != ospResolvedId)
161 item.CreatorId = ospResolvedId; 161 item.CreatorId = ospResolvedId;
162 162
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
125 { 125 {
126 string filename = string.Format("{0}{1}_{2}.xml", path, inventoryItem.Name, inventoryItem.ID); 126 string filename = string.Format("{0}{1}_{2}.xml", path, inventoryItem.Name, inventoryItem.ID);
127 127
128 string serialization = UserInventoryItemSerializer.Serialize(inventoryItem);
129 m_archive.WriteFile(filename, serialization);
130
131 // Record the creator of this item for user record purposes (which might go away soon) 128 // Record the creator of this item for user record purposes (which might go away soon)
132 m_userUuids[inventoryItem.CreatorIdAsUuid] = 1; 129 m_userUuids[inventoryItem.CreatorIdAsUuid] = 1;
133 130
134 m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); 131 InventoryItemBase saveItem = (InventoryItemBase)inventoryItem.Clone();
132 saveItem.CreatorId = OspResolver.MakeOspa(saveItem.CreatorIdAsUuid, m_module.CommsManager);
133
134 string serialization = UserInventoryItemSerializer.Serialize(saveItem);
135 m_archive.WriteFile(filename, serialization);
136
137 m_assetGatherer.GatherAssetUuids(saveItem.AssetID, (AssetType)saveItem.AssetType, m_assetUuids);
135 } 138 }
136 139
137 /// <summary> 140 /// <summary>