diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index d94ff6c..873070a 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -77,16 +77,25 @@ namespace OpenSim.Framework.Communications.Cache | |||
77 | } | 77 | } |
78 | } | 78 | } |
79 | } | 79 | } |
80 | } | 80 | } |
81 | 81 | ||
82 | public void UpdateUserInventory(LLUUID userID) | 82 | /// <summary> |
83 | /// Request the inventory data for the given user. This will occur asynchronous if running on a grid | ||
84 | /// </summary> | ||
85 | /// <param name="userID"></param> | ||
86 | /// <param name="userInfo"></param> | ||
87 | public void RequestInventoryForUser(LLUUID userID) | ||
83 | { | 88 | { |
84 | CachedUserInfo userInfo = GetUserDetails(userID); | 89 | CachedUserInfo userInfo = GetUserDetails(userID); |
85 | if (userInfo != null) | 90 | if (userInfo != null) |
91 | { | ||
92 | m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive); | ||
93 | } | ||
94 | else | ||
86 | { | 95 | { |
87 | RequestInventoryForUser(userID, userInfo); | 96 | m_log.ErrorFormat("[USER CACHE]: RequestInventoryForUser() - user profile for user {0} not found", userID); |
88 | } | 97 | } |
89 | } | 98 | } |
90 | 99 | ||
91 | public CachedUserInfo GetUserDetails(LLUUID userID) | 100 | public CachedUserInfo GetUserDetails(LLUUID userID) |
92 | { | 101 | { |
@@ -408,15 +417,5 @@ namespace OpenSim.Framework.Communications.Cache | |||
408 | } | 417 | } |
409 | } | 418 | } |
410 | } | 419 | } |
411 | |||
412 | /// <summary> | ||
413 | /// Request the inventory data for the given user. | ||
414 | /// </summary> | ||
415 | /// <param name="userID"></param> | ||
416 | /// <param name="userInfo"></param> | ||
417 | private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo) | ||
418 | { | ||
419 | m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive); | ||
420 | } | ||
421 | } | 420 | } |
422 | } | 421 | } |