aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2015-06-05 10:07:50 -0700
committerDiva Canto2015-06-05 10:07:50 -0700
commit96f0c6f074301484b44ce29c1a92ce13766f9883 (patch)
treee9d9d084d73ac32183dbf641e8053254645592ab /OpenSim/Services
parentThe only purpose of this commit is to remove an erroneous comment. It turns o... (diff)
downloadopensim-SC-96f0c6f074301484b44ce29c1a92ce13766f9883.zip
opensim-SC-96f0c6f074301484b44ce29c1a92ce13766f9883.tar.gz
opensim-SC-96f0c6f074301484b44ce29c1a92ce13766f9883.tar.bz2
opensim-SC-96f0c6f074301484b44ce29c1a92ce13766f9883.tar.xz
More on mantis #7567. Two things:
- Increase the inventory cache timeout to 20 secs, so that the items will still be there when they are needed by the sim for rezzing - Before rezzing attachs, make a call to GetMultipleItems so to fetch them all at the same time
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index a68ec5a..597d92b 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Services.Connectors
62 /// </remarks> 62 /// </remarks>
63 private int m_requestTimeoutSecs = -1; 63 private int m_requestTimeoutSecs = -1;
64 64
65 private const double CACHE_EXPIRATION_SECONDS = 8.0; 65 private const double CACHE_EXPIRATION_SECONDS = 20.0;
66 private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>(); 66 private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>();
67 67
68 public XInventoryServicesConnector() 68 public XInventoryServicesConnector()
@@ -244,7 +244,7 @@ namespace OpenSim.Services.Connectors
244 public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs) 244 public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
245 { 245 {
246 InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length]; 246 InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length];
247 //m_log.DebugFormat("[XXX]: In GetMultipleFoldersContent {0}", folderIDs.Length); 247 // m_log.DebugFormat("[XXX]: In GetMultipleFoldersContent {0}", String.Join(",", folderIDs));
248 try 248 try
249 { 249 {
250 Dictionary<string, object> resultSet = MakeRequest("GETMULTIPLEFOLDERSCONTENT", 250 Dictionary<string, object> resultSet = MakeRequest("GETMULTIPLEFOLDERSCONTENT",
@@ -544,6 +544,8 @@ namespace OpenSim.Services.Connectors
544 544
545 public virtual InventoryItemBase[] GetMultipleItems(UUID principalID, UUID[] itemIDs) 545 public virtual InventoryItemBase[] GetMultipleItems(UUID principalID, UUID[] itemIDs)
546 { 546 {
547 //m_log.DebugFormat("[XXX]: In GetMultipleItems {0}", String.Join(",", itemIDs));
548
547 InventoryItemBase[] itemArr = new InventoryItemBase[itemIDs.Length]; 549 InventoryItemBase[] itemArr = new InventoryItemBase[itemIDs.Length];
548 // Try to get them from the cache 550 // Try to get them from the cache
549 List<UUID> pending = new List<UUID>(); 551 List<UUID> pending = new List<UUID>();