From a29d53986aa3ca9bfd6759789c8a6f434b78d627 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Jan 2015 23:10:10 +0000
Subject: In GetDisplayNames, if user last name is Resident then only send
 first name for display.

This is to match existing behaviour with UDP behaviour where this is masked out.
And to make it consistent with other places where viewers mask this out themselves.
Relates to http://opensimulator.org/mantis/view.php?id=7408
---
 OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
index 08faf2d..05fa446 100644
--- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Capabilities.Handlers
                         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["display_name"] = parts[1] != "Resident" ? OSD.FromString(name) : OSD.FromString(parts[0]);
                         osdname["legacy_first_name"] = parts[0];
                         osdname["legacy_last_name"] = parts[1];
                         osdname["username"] = "";
-- 
cgit v1.1