diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index d8234bc..7189e36 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -170,14 +170,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
170 | int failedAssetRestores = 0; | 170 | int failedAssetRestores = 0; |
171 | int successfulItemRestores = 0; | 171 | int successfulItemRestores = 0; |
172 | List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>(); | 172 | List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>(); |
173 | 173 | ||
174 | if (!m_userInfo.HasReceivedInventory) | 174 | if (!m_userInfo.HasReceivedInventory) |
175 | { | 175 | { |
176 | m_log.ErrorFormat( | 176 | // If the region server has access to the user admin service (by which users are created), |
177 | "[INVENTORY ARCHIVER]: Have not yet received inventory info for user {0} {1}", | 177 | // then we'll assume that it's okay to fiddle with the user's inventory even if they are not on the |
178 | m_userInfo.UserProfile.Name, m_userInfo.UserProfile.ID); | 178 | // server. |
179 | // | ||
180 | // FIXME: FetchInventory should probably be assumed to by async anyway, since even standalones might | ||
181 | // use a remote inventory service, though this is vanishingly rare at the moment. | ||
182 | if (null == commsManager.UserAdminService) | ||
183 | { | ||
184 | m_log.ErrorFormat( | ||
185 | "[INVENTORY ARCHIVER]: Have not yet received inventory info for user {0} {1}", | ||
186 | m_userInfo.UserProfile.Name, m_userInfo.UserProfile.ID); | ||
179 | 187 | ||
180 | return nodesLoaded; | 188 | return nodesLoaded; |
189 | } | ||
190 | else | ||
191 | { | ||
192 | m_userInfo.FetchInventory(); | ||
193 | } | ||
181 | } | 194 | } |
182 | 195 | ||
183 | InventoryFolderImpl inventoryFolder = m_userInfo.RootFolder.FindFolderByPath(m_invPath); | 196 | InventoryFolderImpl inventoryFolder = m_userInfo.RootFolder.FindFolderByPath(m_invPath); |