From ea5aa82c2c3368f942f5b58ba2e13ce9a2d2b582 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jun 2015 06:58:07 -0700
Subject: 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.

---
 .../Connectors/Inventory/XInventoryServicesConnector.cs        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/Connectors/Inventory')

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
                     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)
-- 
cgit v1.1