diff options
author | Justin Clark-Casey (justincc) | 2015-01-24 00:51:45 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2015-01-24 00:51:45 +0000 |
commit | 3289aa3bcd38567a7e22e6515060c63ac7f067d0 (patch) | |
tree | 33fc1e021918e95e2f9ac1fba1db598415b920a1 /OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | |
parent | In GetDisplayNames, if user last name is Resident then only send first name f... (diff) | |
download | opensim-SC-3289aa3bcd38567a7e22e6515060c63ac7f067d0.zip opensim-SC-3289aa3bcd38567a7e22e6515060c63ac7f067d0.tar.gz opensim-SC-3289aa3bcd38567a7e22e6515060c63ac7f067d0.tar.bz2 opensim-SC-3289aa3bcd38567a7e22e6515060c63ac7f067d0.tar.xz |
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.
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs')
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs index 05fa446..08faf2d 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"] = parts[1] != "Resident" ? OSD.FromString(name) : OSD.FromString(parts[0]); | 97 | osdname["display_name"] = OSD.FromString(name); |
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"] = ""; |