diff options
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs index b123e9d..33ec485 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |||
@@ -555,6 +555,9 @@ namespace OpenSim.Services.Connectors | |||
555 | pending.Add(id); | 555 | pending.Add(id); |
556 | } | 556 | } |
557 | 557 | ||
558 | if (pending.Count == 0) // we're done, everything was in the cache | ||
559 | return itemArr; | ||
560 | |||
558 | try | 561 | try |
559 | { | 562 | { |
560 | Dictionary<string, object> resultSet = MakeRequest("GETMULTIPLEITEMS", | 563 | Dictionary<string, object> resultSet = MakeRequest("GETMULTIPLEITEMS", |
@@ -565,7 +568,12 @@ namespace OpenSim.Services.Connectors | |||
565 | }); | 568 | }); |
566 | 569 | ||
567 | if (!CheckReturn(resultSet)) | 570 | if (!CheckReturn(resultSet)) |
568 | return null; | 571 | { |
572 | if (i == 0) | ||
573 | return null; | ||
574 | else | ||
575 | return itemArr; | ||
576 | } | ||
569 | 577 | ||
570 | // carry over index i where we left above | 578 | // carry over index i where we left above |
571 | foreach (KeyValuePair<string, object> kvp in resultSet) | 579 | foreach (KeyValuePair<string, object> kvp in resultSet) |