try to better merge avn and os fetchinventory and fetchinvdescendents

2 files changed, 92 insertions, 7 deletions

diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs
index 638e8bc..1753f60 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs
@@ -64,21 +64,36 @@ namespace OpenSim.Capabilities.Handlers
 
             UUID[] itemIDs = new UUID[itemsRequested.Count];
             int i = 0;
+
             foreach (OSDMap osdItemId in itemsRequested)
             {
                 itemIDs[i++] = osdItemId["item_id"].AsUUID();
             }
 
-            InventoryItemBase[] items = m_inventoryService.GetMultipleItems(m_agentID, itemIDs);
+            InventoryItemBase[] items = null;
 
-            if (items == null)
+            if (m_agentID != UUID.Zero)
+            {
+                items = m_inventoryService.GetMultipleItems(m_agentID, itemIDs);
+
+                if (items == null)
+                {
+                    // OMG!!! One by one!!! This is fallback code, in case the backend isn't updated
+                    m_log.WarnFormat("[FETCH INVENTORY HANDLER]: GetMultipleItems failed. Falling back to fetching inventory items one by one.");
+                    items = new InventoryItemBase[itemsRequested.Count];                   
+                    InventoryItemBase item = new InventoryItemBase();
+                    item.Owner = m_agentID;
+                    foreach (UUID id in itemIDs)
+                    {
+                        item.ID = id;
+                        items[i++] = m_inventoryService.GetItem(item);
+                    }
+                }
+            }
+            else
             {
-                // OMG!!! One by one!!! This is fallback code, in case the backend isn't updated
-                m_log.WarnFormat("[FETCH INVENTORY HANDLER]: GetMultipleItems failed. Falling back to fetching inventory items one by one.");
                 items = new InventoryItemBase[itemsRequested.Count];
-                i = 0;
                 InventoryItemBase item = new InventoryItemBase();
-                item.Owner = m_agentID;
                 foreach (UUID id in itemIDs)
                 {
                     item.ID = id;
@@ -93,7 +108,6 @@ namespace OpenSim.Capabilities.Handlers
                     // We don't know the agent that this request belongs to so we'll use the agent id of the item
                     // which will be the same for all items.
                     llsdReply.agent_id = item.Owner;
-
                     llsdReply.items.Array.Add(ConvertInventoryItem(item));
                 }
             }
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2ServerConnector.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2ServerConnector.cs
new file mode 100644
index 0000000..618f075
--- /dev/null
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2ServerConnector.cs
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class FetchInventory2ServerConnector : ServiceConnector
+    {
+        private IInventoryService m_InventoryService;
+        private string m_ConfigName = "CapsService";
+
+        public FetchInventory2ServerConnector(IConfigSource config, IHttpServer server, string configName)
+            : base(config, server, configName)
+        {
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
+
+            string invService = serverConfig.GetString("InventoryService", String.Empty);
+
+            if (invService == String.Empty)
+                throw new Exception("No InventoryService in config file");
+
+            Object[] args = new Object[] { config };
+            m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
+
+            if (m_InventoryService == null)
+                throw new Exception(String.Format("Failed to load InventoryService from {0}; config is {1}", invService, m_ConfigName));
+
+            FetchInventory2Handler fiHandler = new FetchInventory2Handler(m_InventoryService, UUID.Zero);
+            IRequestHandler reqHandler
+                = new RestStreamHandler(
+                    "POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest, "FetchInventory", null);
+            server.AddStreamHandler(reqHandler);
+        }
+    }
+}