2 files changed, 136 insertions, 16 deletions

diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
new file mode 100644
index 0000000..589602d
--- /dev/null
+++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
@@ -0,0 +1,120 @@
+/*
+ * 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 System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenMetaverse.Imaging;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class GetDisplayNamesHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IUserManagement m_UserManagement;
+
+        public GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description)
+            : base("GET", path, name, description)
+        {
+            m_UserManagement = umService;
+        }
+
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            m_log.DebugFormat("[GET_DISPLAY_NAMES]: called {0}", httpRequest.Url.Query);
+
+            NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
+            string[] ids = query.GetValues("ids");
+
+
+            if (m_UserManagement == null)
+            {
+                m_log.Error("[GET_DISPLAY_NAMES]: Cannot fetch display names without a user management component");
+                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.InternalServerError;
+                return new byte[0];
+            }
+
+            OSDMap osdReply = new OSDMap();
+            OSDArray agents = new OSDArray();
+
+            osdReply["agents"] = agents;
+            foreach (string id in ids)
+            {
+                UUID uuid = UUID.Zero;
+                if (UUID.TryParse(id, out uuid))
+                {
+                    string name = m_UserManagement.GetUserName(uuid);
+                    if (!string.IsNullOrEmpty(name))
+                    {
+                        string[] parts = name.Split(new char[] {' '});
+                        OSDMap osdname = new OSDMap();
+                        osdname["display_name_next_update"] = OSD.FromDate(DateTime.MinValue);
+                        osdname["display_name_expires"] = OSD.FromDate(DateTime.Now.AddMonths(1));
+                        osdname["display_name"] = OSD.FromString(name);
+                        osdname["legacy_first_name"] = parts[0];
+                        osdname["legacy_last_name"] = parts[1];
+                        osdname["username"] = OSD.FromString(name);
+                        osdname["id"] = OSD.FromUUID(uuid);
+                        osdname["is_display_name_default"] = OSD.FromBoolean(true);
+
+                        agents.Add(osdname);
+                    }
+                }
+            }
+
+            // Full content request
+            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK;
+            //httpResponse.ContentLength = ??;
+            httpResponse.ContentType = "application/llsd+xml";
+
+            string reply = OSDParser.SerializeLLSDXmlString(osdReply);
+            return System.Text.Encoding.UTF8.GetBytes(reply);
+
+        }
+
+    }
+}
\ 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