diff options
author | Justin Clarke Casey | 2009-02-12 17:07:44 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-12 17:07:44 +0000 |
commit | 31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302 (patch) | |
tree | 89a086e5dcdc1cb026b9a9fe2d9d914babaa65a0 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | * Added XEngine tests and gathered other ScriptEngine (diff) | |
download | opensim-SC_OLD-31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302.zip opensim-SC_OLD-31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302.tar.gz opensim-SC_OLD-31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302.tar.bz2 opensim-SC_OLD-31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302.tar.xz |
* refactor: Move RequestInventoryForUser() from service to CachedUserInfo
* This simplifies callers in most cases - CachedUserInfo is already handling the rest of the fetch inventory work anyway
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index e366c79..847d32d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -472,7 +472,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
472 | if (recipientUserInfo != null) | 472 | if (recipientUserInfo != null) |
473 | { | 473 | { |
474 | if (!recipientUserInfo.HasReceivedInventory) | 474 | if (!recipientUserInfo.HasReceivedInventory) |
475 | CommsManager.UserProfileCacheService.RequestInventoryForUser(recipient); | 475 | recipientUserInfo.FetchInventory(); |
476 | 476 | ||
477 | // Insert a copy of the item into the recipient | 477 | // Insert a copy of the item into the recipient |
478 | InventoryItemBase itemCopy = new InventoryItemBase(); | 478 | InventoryItemBase itemCopy = new InventoryItemBase(); |
@@ -1202,7 +1202,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1202 | avatarId); | 1202 | avatarId); |
1203 | } | 1203 | } |
1204 | if (!profile.HasReceivedInventory) | 1204 | if (!profile.HasReceivedInventory) |
1205 | CommsManager.UserProfileCacheService.RequestInventoryForUser(avatarId); | 1205 | profile.FetchInventory(); |
1206 | |||
1206 | InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId); | 1207 | InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId); |
1207 | 1208 | ||
1208 | if (agentItem == null) | 1209 | if (agentItem == null) |
@@ -1841,8 +1842,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1841 | // Async inventory requests will queue, but they will never | 1842 | // Async inventory requests will queue, but they will never |
1842 | // execute unless inventory is actually fetched | 1843 | // execute unless inventory is actually fetched |
1843 | // | 1844 | // |
1844 | CommsManager.UserProfileCacheService.RequestInventoryForUser( | 1845 | userInfo.FetchInventory(); |
1845 | userInfo.UserProfile.ID); | ||
1846 | } | 1846 | } |
1847 | 1847 | ||
1848 | if (userInfo != null) | 1848 | if (userInfo != null) |