ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

reduce number of useless strings on get displaynames cap

Browse Source
This commit is contained in:
UbitUmarov
2022-03-15 00:44:12 +00:00
parent f14055b6a8
commit 476ea2b51d
3 changed files with 126 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@@ -2297,7 +2297,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
else
{
Dictionary<UUID, string> names = m_UserManager.GetKnownUserNames(ids, m_scopeID);
List<UserData> names = m_UserManager.GetKnownUsers(ids, m_scopeID);
lsl = LLSDxmlEncode2.Start(names.Count * 256 + 256);
LLSDxmlEncode2.AddMap(lsl);
@@ -2307,30 +2307,21 @@ namespace OpenSim.Region.ClientStack.Linden
{
LLSDxmlEncode2.AddArray("agents", lsl);
foreach (KeyValuePair<UUID,string> kvp in names)
foreach (UserData ud in names)
{
if(kvp.Key.IsZero())
continue;
string fullname = kvp.Value;
// dont tell about unknown users, we can't send them back on Bad either
if (string.IsNullOrEmpty(fullname))
continue;
string[] parts = fullname.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
if(string.IsNullOrEmpty(parts[0]) || parts[0].Equals("Unknown"))
if (string.IsNullOrEmpty(ud.FirstName) || ud.FirstName.Equals("Unkown"))
continue;
string fullname = ud.FirstName + " " + ud.LastName;
LLSDxmlEncode2.AddMap(lsl);
LLSDxmlEncode2.AddElem("username", fullname, lsl);
LLSDxmlEncode2.AddElem("display_name", fullname, lsl);
LLSDxmlEncode2.AddElem("display_name_next_update", DateTime.UtcNow.AddDays(8), lsl);
LLSDxmlEncode2.AddElem("display_name_expires", DateTime.UtcNow.AddMonths(1), lsl);
LLSDxmlEncode2.AddElem("display_name", fullname, lsl);
LLSDxmlEncode2.AddElem("legacy_first_name", parts[0], lsl);
if (string.IsNullOrEmpty(parts[1]))
LLSDxmlEncode2.AddElem("legacy_last_name", "", lsl);
else
LLSDxmlEncode2.AddElem("legacy_last_name", parts[1], lsl);
LLSDxmlEncode2.AddElem("username", fullname, lsl);
LLSDxmlEncode2.AddElem("id", kvp.Key, lsl);
LLSDxmlEncode2.AddElem("legacy_first_name", ud.FirstName, lsl);
LLSDxmlEncode2.AddElem("legacy_last_name", ud.LastName, lsl);
LLSDxmlEncode2.AddElem("id", ud.Id, lsl);
LLSDxmlEncode2.AddElem("is_display_name_default", true, lsl);
LLSDxmlEncode2.AddEndMap(lsl);
}