diff options
| author | Diva Canto | 2009-08-13 11:30:29 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-13 11:30:29 -0700 |
| commit | 6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75 (patch) | |
| tree | 82b2f99cb17b12d2bae173e33065170200b49eae /OpenSim/Region/ClientStack/LindenUDP | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75.zip opensim-SC_OLD-6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75.tar.gz opensim-SC_OLD-6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75.tar.bz2 opensim-SC_OLD-6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75.tar.xz | |
Inventory redirects from CachedUserInfo to InventoryService COMPLETE!
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 7633b7b..aaa236c 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -6609,20 +6609,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 6609 | } | 6609 | } |
| 6610 | else // Agent | 6610 | else // Agent |
| 6611 | { | 6611 | { |
| 6612 | CachedUserInfo userInfo = ((Scene)m_scene).CommsManager.UserProfileCacheService.GetUserDetails(AgentId); | 6612 | //InventoryItemBase assetRequestItem = userInfo.RootFolder.FindItem(itemID); |
| 6613 | if (userInfo == null) | 6613 | IInventoryService invService = m_scene.RequestModuleInterface<IInventoryService>(); |
| 6614 | { | 6614 | InventoryItemBase assetRequestItem = invService.QueryItem(new InventoryItemBase(itemID)); |
| 6615 | m_log.ErrorFormat( | ||
| 6616 | "[CLIENT]: Could not resolve user {0} for caps inventory update", | ||
| 6617 | AgentId); | ||
| 6618 | |||
| 6619 | break; | ||
| 6620 | } | ||
| 6621 | |||
| 6622 | if (userInfo.RootFolder == null) | ||
| 6623 | break; | ||
| 6624 | |||
| 6625 | InventoryItemBase assetRequestItem = userInfo.RootFolder.FindItem(itemID); | ||
| 6626 | if (assetRequestItem == null) | 6615 | if (assetRequestItem == null) |
| 6627 | { | 6616 | { |
| 6628 | assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); | 6617 | assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); |