From 079d096d62bd94a2cbfc68e644364704703ec5ea Mon Sep 17 00:00:00 2001
From: Christopher <christopher.latza@gmail.com>
Date: Fri, 21 Aug 2015 23:27:46 +0200
Subject: [PATCH] add GetUser(UUID uuid, out UserData userdata) to
 IUserManagement

---
 OpenSim/Services/Interfaces/IUserManagement.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Services/Interfaces/IUserManagement.cs b/OpenSim/Services/Interfaces/IUserManagement.cs
index 9e560d5..b890dc7 100644
--- a/OpenSim/Services/Interfaces/IUserManagement.cs
+++ b/OpenSim/Services/Interfaces/IUserManagement.cs
@@ -29,6 +29,7 @@
 using System.Collections.Generic;
 
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Services.Interfaces
 {
@@ -93,5 +94,7 @@ public interface IUserManagement
         void AddUser(UUID uuid, string firstName, string lastName, string homeURL);
 
         bool IsLocalGridUser(UUID uuid);
+
+        bool GetUser(UUID uuid, out UserData userdata);
     }
 }

From cf3296f51101b4e157683407b9b9fb9e4a56d453 Mon Sep 17 00:00:00 2001
From: Christopher <christopher.latza@gmail.com>
Date: Fri, 21 Aug 2015 23:32:15 +0200
Subject: [PATCH] =?UTF-8?q?GetDisplayNamesHandler=20=20use=20now=20the=20b?=
 =?UTF-8?q?adID=20flag=20of=20the=20getDisplayNames=20protoko=CC=A3ll=20to?=
 =?UTF-8?q?=20prevent=20occur=20of=20Unknown=20UserUMMAU42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetDisplayNames/GetDisplayNamesHandler.cs      | 27 +++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
index 589602d..9b67460 100644
--- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
@@ -80,32 +80,43 @@ protected override byte[] ProcessRequest(string path, Stream request, IOSHttpReq
 
             OSDMap osdReply = new OSDMap();
             OSDArray agents = new OSDArray();
+            OSDArray badIDs = new OSDArray();
 
             osdReply["agents"] = agents;
+            osdReply["bad_ids"] = badIDs;
+
+            OSDArray osdarray = new OSDArray();
+
             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))
+                    UserData UD = new UserData();
+
+                    if (m_UserManagement.GetUser(uuid, out UD))
                     {
-                        string[] parts = name.Split(new char[] {' '});
                         OSDMap osdname = new OSDMap();
-                        osdname["display_name_next_update"] = OSD.FromDate(DateTime.MinValue);
+                        osdname["display_name_next_update"] = OSD.FromDate(DateTime.Now.AddHours(1));
                         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["display_name"] = OSD.FromString(UD.FirstName + " " + UD.LastName);
+                        osdname["legacy_first_name"] = UD.FirstName;
+                        osdname["legacy_last_name"] = UD.LastName;
+                        osdname["username"] = OSD.FromString(UD.FirstName + "." + UD.LastName);
                         osdname["id"] = OSD.FromUUID(uuid);
                         osdname["is_display_name_default"] = OSD.FromBoolean(true);
 
                         agents.Add(osdname);
                     }
+                    else
+                    {
+                        osdarray.Add(OSD.FromString(uuid.ToString()));
+                    }
                 }
             }
 
+            badIDs.Add(osdarray);
+
             // Full content request
             httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK;
             //httpResponse.ContentLength = ??;