diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 98b686e..ef10104 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -37,10 +37,11 @@ using OpenSim.Framework; | |||
37 | using OpenSim.Framework.Serialization; | 37 | using OpenSim.Framework.Serialization; |
38 | using OpenSim.Framework.Serialization.External; | 38 | using OpenSim.Framework.Serialization.External; |
39 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications; |
40 | using OpenSim.Framework.Communications.Cache; | 40 | |
41 | using OpenSim.Framework.Communications.Osp; | 41 | using OpenSim.Framework.Communications.Osp; |
42 | using OpenSim.Region.CoreModules.World.Archiver; | 42 | using OpenSim.Region.CoreModules.World.Archiver; |
43 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
44 | using OpenSim.Services.Interfaces; | ||
44 | 45 | ||
45 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 46 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
46 | { | 47 | { |
@@ -54,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
54 | private const string STAR_WILDCARD = "*"; | 55 | private const string STAR_WILDCARD = "*"; |
55 | 56 | ||
56 | private InventoryArchiverModule m_module; | 57 | private InventoryArchiverModule m_module; |
57 | private CachedUserInfo m_userInfo; | 58 | private UserAccount m_userInfo; |
58 | private string m_invPath; | 59 | private string m_invPath; |
59 | protected TarArchiveWriter m_archiveWriter; | 60 | protected TarArchiveWriter m_archiveWriter; |
60 | protected UuidGatherer m_assetGatherer; | 61 | protected UuidGatherer m_assetGatherer; |
@@ -89,7 +90,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
89 | /// </summary> | 90 | /// </summary> |
90 | public InventoryArchiveWriteRequest( | 91 | public InventoryArchiveWriteRequest( |
91 | Guid id, InventoryArchiverModule module, Scene scene, | 92 | Guid id, InventoryArchiverModule module, Scene scene, |
92 | CachedUserInfo userInfo, string invPath, string savePath) | 93 | UserAccount userInfo, string invPath, string savePath) |
93 | : this( | 94 | : this( |
94 | id, | 95 | id, |
95 | module, | 96 | module, |
@@ -105,7 +106,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
105 | /// </summary> | 106 | /// </summary> |
106 | public InventoryArchiveWriteRequest( | 107 | public InventoryArchiveWriteRequest( |
107 | Guid id, InventoryArchiverModule module, Scene scene, | 108 | Guid id, InventoryArchiverModule module, Scene scene, |
108 | CachedUserInfo userInfo, string invPath, Stream saveStream) | 109 | UserAccount userInfo, string invPath, Stream saveStream) |
109 | { | 110 | { |
110 | m_id = id; | 111 | m_id = id; |
111 | m_module = module; | 112 | m_module = module; |
@@ -148,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
148 | m_userUuids[inventoryItem.CreatorIdAsUuid] = 1; | 149 | m_userUuids[inventoryItem.CreatorIdAsUuid] = 1; |
149 | 150 | ||
150 | InventoryItemBase saveItem = (InventoryItemBase)inventoryItem.Clone(); | 151 | InventoryItemBase saveItem = (InventoryItemBase)inventoryItem.Clone(); |
151 | saveItem.CreatorId = OspResolver.MakeOspa(saveItem.CreatorIdAsUuid, m_scene.CommsManager); | 152 | saveItem.CreatorId = OspResolver.MakeOspa(saveItem.CreatorIdAsUuid, m_scene.UserAccountService); |
152 | 153 | ||
153 | string serialization = UserInventoryItemSerializer.Serialize(saveItem); | 154 | string serialization = UserInventoryItemSerializer.Serialize(saveItem); |
154 | m_archiveWriter.WriteFile(filename, serialization); | 155 | m_archiveWriter.WriteFile(filename, serialization); |
@@ -215,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
215 | { | 216 | { |
216 | InventoryFolderBase inventoryFolder = null; | 217 | InventoryFolderBase inventoryFolder = null; |
217 | InventoryItemBase inventoryItem = null; | 218 | InventoryItemBase inventoryItem = null; |
218 | InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.UserProfile.ID); | 219 | InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.PrincipalID); |
219 | 220 | ||
220 | bool foundStar = false; | 221 | bool foundStar = false; |
221 | 222 | ||
@@ -318,14 +319,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
318 | foreach (UUID creatorId in m_userUuids.Keys) | 319 | foreach (UUID creatorId in m_userUuids.Keys) |
319 | { | 320 | { |
320 | // Record the creator of this item | 321 | // Record the creator of this item |
321 | CachedUserInfo creator | 322 | UserAccount creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, creatorId); |
322 | = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(creatorId); | ||
323 | 323 | ||
324 | if (creator != null) | 324 | if (creator != null) |
325 | { | 325 | { |
326 | m_archiveWriter.WriteFile( | 326 | m_archiveWriter.WriteFile( |
327 | ArchiveConstants.USERS_PATH + creator.UserProfile.Name + ".xml", | 327 | ArchiveConstants.USERS_PATH + creator.FirstName + " " + creator.LastName + ".xml", |
328 | UserProfileSerializer.Serialize(creator.UserProfile)); | 328 | UserProfileSerializer.Serialize(creator.PrincipalID, creator.FirstName, creator.LastName)); |
329 | } | 329 | } |
330 | else | 330 | else |
331 | { | 331 | { |