diff options
* OMG! All but one references to UserProfileCacheService have been rerouted!
* HG is seriously broken here
* Compiles. Untested.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 3417c87..706d891 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
53 | 53 | ||
54 | protected TarArchiveReader archive; | 54 | protected TarArchiveReader archive; |
55 | 55 | ||
56 | private CachedUserInfo m_userInfo; | 56 | private UserAccount m_userInfo; |
57 | private string m_invPath; | 57 | private string m_invPath; |
58 | 58 | ||
59 | /// <value> | 59 | /// <value> |
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
67 | private Stream m_loadStream; | 67 | private Stream m_loadStream; |
68 | 68 | ||
69 | public InventoryArchiveReadRequest( | 69 | public InventoryArchiveReadRequest( |
70 | Scene scene, CachedUserInfo userInfo, string invPath, string loadPath) | 70 | Scene scene, UserAccount userInfo, string invPath, string loadPath) |
71 | : this( | 71 | : this( |
72 | scene, | 72 | scene, |
73 | userInfo, | 73 | userInfo, |
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
77 | } | 77 | } |
78 | 78 | ||
79 | public InventoryArchiveReadRequest( | 79 | public InventoryArchiveReadRequest( |
80 | Scene scene, CachedUserInfo userInfo, string invPath, Stream loadStream) | 80 | Scene scene, UserAccount userInfo, string invPath, Stream loadStream) |
81 | { | 81 | { |
82 | m_scene = scene; | 82 | m_scene = scene; |
83 | m_userInfo = userInfo; | 83 | m_userInfo = userInfo; |
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
103 | //InventoryFolderImpl rootDestinationFolder = m_userInfo.RootFolder.FindFolderByPath(m_invPath); | 103 | //InventoryFolderImpl rootDestinationFolder = m_userInfo.RootFolder.FindFolderByPath(m_invPath); |
104 | InventoryFolderBase rootDestinationFolder | 104 | InventoryFolderBase rootDestinationFolder |
105 | = InventoryArchiveUtils.FindFolderByPath( | 105 | = InventoryArchiveUtils.FindFolderByPath( |
106 | m_scene.InventoryService, m_userInfo.UserProfile.ID, m_invPath); | 106 | m_scene.InventoryService, m_userInfo.PrincipalID, m_invPath); |
107 | 107 | ||
108 | if (null == rootDestinationFolder) | 108 | if (null == rootDestinationFolder) |
109 | { | 109 | { |
@@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
280 | // even though there is a AssetType.RootCategory | 280 | // even though there is a AssetType.RootCategory |
281 | destFolder | 281 | destFolder |
282 | = new InventoryFolderBase( | 282 | = new InventoryFolderBase( |
283 | newFolderId, newFolderName, m_userInfo.UserProfile.ID, | 283 | newFolderId, newFolderName, m_userInfo.PrincipalID, |
284 | (short)AssetType.Unknown, destFolder.ID, 1); | 284 | (short)AssetType.Unknown, destFolder.ID, 1); |
285 | m_scene.InventoryService.AddFolder(destFolder); | 285 | m_scene.InventoryService.AddFolder(destFolder); |
286 | 286 | ||
@@ -368,10 +368,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
368 | } | 368 | } |
369 | else | 369 | else |
370 | { | 370 | { |
371 | item.CreatorIdAsUuid = m_userInfo.UserProfile.ID; | 371 | item.CreatorIdAsUuid = m_userInfo.PrincipalID; |
372 | } | 372 | } |
373 | 373 | ||
374 | item.Owner = m_userInfo.UserProfile.ID; | 374 | item.Owner = m_userInfo.PrincipalID; |
375 | 375 | ||
376 | // Reset folder ID to the one in which we want to load it | 376 | // Reset folder ID to the one in which we want to load it |
377 | item.Folder = loadFolder.ID; | 377 | item.Folder = loadFolder.ID; |