aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Inventory
diff options
context:
space:
mode:
authorUbitUmarov2015-09-11 22:26:05 +0100
committerUbitUmarov2015-09-11 22:26:05 +0100
commit410ae96d044f234f35a0824d934d72e77155d62f (patch)
treedc2614ce196230120e7a222254ae15648c542d41 /OpenSim/Services/Connectors/Inventory
parent inventory mess return to the state before divas cache issue (diff)
downloadopensim-SC-410ae96d044f234f35a0824d934d72e77155d62f.zip
opensim-SC-410ae96d044f234f35a0824d934d72e77155d62f.tar.gz
opensim-SC-410ae96d044f234f35a0824d934d72e77155d62f.tar.bz2
opensim-SC-410ae96d044f234f35a0824d934d72e77155d62f.tar.xz
put back diva's cache with her recent fix but also avoid duplicated InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it
Diffstat (limited to 'OpenSim/Services/Connectors/Inventory')
-rw-r--r--OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index f235446..243da52 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -474,7 +474,13 @@ namespace OpenSim.Services.Connectors
474 { "CreationDate", item.CreationDate.ToString() } 474 { "CreationDate", item.CreationDate.ToString() }
475 }); 475 });
476 476
477 return CheckReturn(ret); 477 bool result = CheckReturn(ret);
478 if (result)
479 {
480 m_ItemCache.AddOrUpdate(item.ID, item, CACHE_EXPIRATION_SECONDS);
481 }
482
483 return result;
478 } 484 }
479 485
480 public bool MoveItems(UUID principalID, List<InventoryItemBase> items) 486 public bool MoveItems(UUID principalID, List<InventoryItemBase> items)
@@ -551,6 +557,7 @@ namespace OpenSim.Services.Connectors
551 List<UUID> pending = new List<UUID>(); 557 List<UUID> pending = new List<UUID>();
552 InventoryItemBase item = null; 558 InventoryItemBase item = null;
553 int i = 0; 559 int i = 0;
560
554 foreach (UUID id in itemIDs) 561 foreach (UUID id in itemIDs)
555 { 562 {
556 if (m_ItemCache.TryGetValue(id, out item)) 563 if (m_ItemCache.TryGetValue(id, out item))