aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-01-23 23:10:10 +0000
committerJustin Clark-Casey (justincc)2015-01-23 23:17:49 +0000
commita29d53986aa3ca9bfd6759789c8a6f434b78d627 (patch)
treeb1905e7fc7560c88d0282cc7b819ea232bfcfaec
parentWhen deleting an assembly before re-compile, make sure its attributes allow d... (diff)
downloadopensim-SC_OLD-a29d53986aa3ca9bfd6759789c8a6f434b78d627.zip
opensim-SC_OLD-a29d53986aa3ca9bfd6759789c8a6f434b78d627.tar.gz
opensim-SC_OLD-a29d53986aa3ca9bfd6759789c8a6f434b78d627.tar.bz2
opensim-SC_OLD-a29d53986aa3ca9bfd6759789c8a6f434b78d627.tar.xz
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
-rw-r--r--OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs2
1 files changed, 1 insertions, 1 deletions
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
94 OSDMap osdname = new OSDMap(); 94 OSDMap osdname = new OSDMap();
95 osdname["display_name_next_update"] = OSD.FromDate(DateTime.MinValue); 95 osdname["display_name_next_update"] = OSD.FromDate(DateTime.MinValue);
96 osdname["display_name_expires"] = OSD.FromDate(DateTime.Now.AddMonths(1)); 96 osdname["display_name_expires"] = OSD.FromDate(DateTime.Now.AddMonths(1));
97 osdname["display_name"] = OSD.FromString(name); 97 osdname["display_name"] = parts[1] != "Resident" ? OSD.FromString(name) : OSD.FromString(parts[0]);
98 osdname["legacy_first_name"] = parts[0]; 98 osdname["legacy_first_name"] = parts[0];
99 osdname["legacy_last_name"] = parts[1]; 99 osdname["legacy_last_name"] = parts[1];
100 osdname["username"] = ""; 100 osdname["username"] = "";