From 3289aa3bcd38567a7e22e6515060c63ac7f067d0 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Sat, 24 Jan 2015 00:51:45 +0000
Subject: [PATCH] Revert "In GetDisplayNames, if user last name is Resident
 then only send first name for display."

Reverting at this point since it may not work well with all viewers.
Requires further investigation.

This reverts commit a29d53986aa3ca9bfd6759789c8a6f434b78d627.
---
 .../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 05fa446ce9..08faf2d91a 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"] = parts[1] != "Resident" ? OSD.FromString(name) : OSD.FromString(parts[0]);
+                        osdname["display_name"] = OSD.FromString(name);
                         osdname["legacy_first_name"] = parts[0];
                         osdname["legacy_last_name"] = parts[1];
                         osdname["username"] = "";