aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-14 18:43:23 +0000
committerJustin Clarke Casey2008-04-14 18:43:23 +0000
commitb7ae8701ce6881991fbacf28cdbb0d09f220f6ec (patch)
tree39247c37f31b9ad774a47e660eb9d314ef4c4582 /OpenSim/Framework/Communications/Cache
parent* Fixed a few warnings. (diff)
downloadopensim-SC_OLD-b7ae8701ce6881991fbacf28cdbb0d09f220f6ec.zip
opensim-SC_OLD-b7ae8701ce6881991fbacf28cdbb0d09f220f6ec.tar.gz
opensim-SC_OLD-b7ae8701ce6881991fbacf28cdbb0d09f220f6ec.tar.bz2
opensim-SC_OLD-b7ae8701ce6881991fbacf28cdbb0d09f220f6ec.tar.xz
* Working towards notifying the client if the inventory service has failed, rather than simply returning 0 items.
* This is very early support which would only be triggered in a rather unlikely case (if the user server correctly received an inventory skeleton, but later on failed to return the whole inventory in a timely manner. Also, this only applies to the 1.19.1.4 client onwards * Code cleanup and support for other failure cases (failure of inventory caching on region crossing, failure to actually add a folder/item, etc, should follow.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 7995841..f746e8b 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -340,7 +340,7 @@ namespace OpenSim.Framework.Communications.Cache
340 /// <param name="fetchFolders"></param> 340 /// <param name="fetchFolders"></param>
341 /// <param name="fetchItems"></param> 341 /// <param name="fetchItems"></param>
342 /// <param name="sortOrder"></param> 342 /// <param name="sortOrder"></param>
343 /// <returns></returns> 343 /// <returns>null if the inventory look up failed</returns>
344 public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, 344 public List<InventoryItemBase> HandleFetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID,
345 bool fetchFolders, bool fetchItems, int sortOrder) 345 bool fetchFolders, bool fetchItems, int sortOrder)
346 { 346 {
@@ -403,7 +403,7 @@ namespace OpenSim.Framework.Communications.Cache
403 { 403 {
404 m_log.ErrorFormat("[INVENTORY CACHE]: Could not find root folder for user {0}", agentID.ToString()); 404 m_log.ErrorFormat("[INVENTORY CACHE]: Could not find root folder for user {0}", agentID.ToString());
405 405
406 return new List<InventoryItemBase>(); ; 406 return null;
407 } 407 }
408 } 408 }
409 else 409 else
@@ -412,7 +412,7 @@ namespace OpenSim.Framework.Communications.Cache
412 "[USER CACHE]: HandleFetchInventoryDescendentsCAPS() Could not find user profile for {0}", 412 "[USER CACHE]: HandleFetchInventoryDescendentsCAPS() Could not find user profile for {0}",
413 agentID); 413 agentID);
414 414
415 return new List<InventoryItemBase>(); 415 return null;
416 } 416 }
417 417
418 // If we've reached this point then we couldn't find the folder, even though the client thinks 418 // If we've reached this point then we couldn't find the folder, even though the client thinks