Initial update to OpenSim 0.8.2.1 source code.

2 files changed, 45 insertions, 28 deletions

diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs
index c0ca1e1..c904392 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs
@@ -25,23 +25,18 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Reflection;
-using log4net;
-using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
-using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Services.Interfaces;
-using Caps = OpenSim.Framework.Capabilities.Caps;
 using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
+using log4net;
+
 namespace OpenSim.Capabilities.Handlers
 {
     public class FetchInventory2Handler
@@ -49,15 +44,17 @@ namespace OpenSim.Capabilities.Handlers
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IInventoryService m_inventoryService;
+        private UUID m_agentID;
 
-        public FetchInventory2Handler(IInventoryService invService)
+        public FetchInventory2Handler(IInventoryService invService, UUID agentId)
         {
             m_inventoryService = invService;
+            m_agentID = agentId;
         }
 
         public string FetchInventoryRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-//            m_log.DebugFormat("[FETCH INVENTORY HANDLER]: Received FetchInventory capabilty request");
+            //m_log.DebugFormat("[FETCH INVENTORY HANDLER]: Received FetchInventory capability request {0}", request);
 
             OSDMap requestmap = (OSDMap)OSDParser.DeserializeLLSDXml(Utils.StringToBytes(request));
             OSDArray itemsRequested = (OSDArray)requestmap["items"];
@@ -65,12 +62,32 @@ namespace OpenSim.Capabilities.Handlers
             string reply;
             LLSDFetchInventory llsdReply = new LLSDFetchInventory();
 
+            UUID[] itemIDs = new UUID[itemsRequested.Count];
+            int i = 0;
             foreach (OSDMap osdItemId in itemsRequested)
             {
-                UUID itemId = osdItemId["item_id"].AsUUID();
+                itemIDs[i++] = osdItemId["item_id"].AsUUID();
+            }
+
+            InventoryItemBase[] items = m_inventoryService.GetMultipleItems(m_agentID, itemIDs);
 
-                InventoryItemBase item = m_inventoryService.GetItem(new InventoryItemBase(itemId));
+            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];
+                i = 0;
+                InventoryItemBase item = new InventoryItemBase();
+                item.Owner = m_agentID;
+                foreach (UUID id in itemIDs)
+                {
+                    item.ID = id;
+                    items[i++] = m_inventoryService.GetItem(item);
+                }
+            }
 
+            foreach (InventoryItemBase item in items)
+            {
                 if (item != null)
                 {
                     // We don't know the agent that this request belongs to so we'll use the agent id of the item
@@ -121,4 +138,4 @@ namespace OpenSim.Capabilities.Handlers
             return llsdItem;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs
index 5bab52f..d42de56 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs
@@ -35,13 +35,13 @@ using OpenMetaverse;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class FetchInventory2ServerConnector : ServiceConnector
+    public class GetDisplayNamesServerConnector : ServiceConnector
     {
-        private IInventoryService m_InventoryService;
+        private IUserManagement m_UserManagement;
         private string m_ConfigName = "CapsService";
 
-        public FetchInventory2ServerConnector(IConfigSource config, IHttpServer server, string configName)
-            : base(config, server, configName)
+        public GetDisplayNamesServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
             if (configName != String.Empty)
                 m_ConfigName = configName;
@@ -50,22 +50,22 @@ namespace OpenSim.Capabilities.Handlers
             if (serverConfig == null)
                 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
-            string invService = serverConfig.GetString("InventoryService", String.Empty);
+            string umService = serverConfig.GetString("AssetService", String.Empty);
 
-            if (invService == String.Empty)
-                throw new Exception("No InventoryService in config file");
+            if (umService == String.Empty)
+                throw new Exception("No AssetService in config file");
 
             Object[] args = new Object[] { config };
-            m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
+            m_UserManagement =
+                    ServerUtils.LoadPlugin<IUserManagement>(umService, args);
 
-            if (m_InventoryService == null)
-                throw new Exception(String.Format("Failed to load InventoryService from {0}; config is {1}", invService, m_ConfigName));
+            if (m_UserManagement == null)
+                throw new Exception(String.Format("Failed to load UserManagement from {0}; config is {1}", umService, m_ConfigName));
 
-            FetchInventory2Handler fiHandler = new FetchInventory2Handler(m_InventoryService);
-            IRequestHandler reqHandler
-                = new RestStreamHandler(
-                    "POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest, "FetchInventory", null);
-            server.AddStreamHandler(reqHandler);
+            string rurl = serverConfig.GetString("GetTextureRedirectURL");
+            
+            server.AddStreamHandler(
+                new GetDisplayNamesHandler("/CAPS/agents/", m_UserManagement, "GetDisplayNames", null));
         }
     }
-}
+}
\ No newline at end of file