ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis #7567. Once again, avoiding prefetching linked items within linked folders. Also fixing the inventory connector GetMultipleItems, so that if everything is in the cache, it returns successfully rather than unsuccessfully.

Browse Source
This commit is contained in:
Diva Canto
2015-06-04 06:58:07 -07:00
parent bac53387a9
commit ea5aa82c2c
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
View File

@@ -555,6 +555,9 @@ namespace OpenSim.Services.Connectors
pending.Add(id);
}
if (pending.Count == 0) // we're done, everything was in the cache
return itemArr;
try
{
Dictionary<string, object> resultSet = MakeRequest("GETMULTIPLEITEMS",
@@ -565,7 +568,12 @@ namespace OpenSim.Services.Connectors
});
if (!CheckReturn(resultSet))
return null;
{
if (i == 0)
return null;
else
return itemArr;
}
// carry over index i where we left above
foreach (KeyValuePair<string, object> kvp in resultSet)