OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

in GetUsersNames(string[] ids) dont loose names HGFriends may have cached

LSLKeyTest
UbitUmarov 2016-08-18 02:49:46 +01:00
parent 7d968213fd
commit 7dbc5803a6
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@ -488,9 +488,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
return ret; return ret;
List<string> missing = new List<string>(); List<string> missing = new List<string>();
Dictionary<UUID,string> untried = new Dictionary<UUID, string>();
// look in cache // look in cache
UserData userdata = new UserData(); UserData userdata = new UserData();
UUID uuid = UUID.Zero; UUID uuid = UUID.Zero;
foreach(string id in ids) foreach(string id in ids)
{ {
@ -499,11 +500,17 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
lock (m_UserCache) lock (m_UserCache)
{ {
if (m_UserCache.TryGetValue(uuid, out userdata) && if (m_UserCache.TryGetValue(uuid, out userdata) &&
userdata.HasGridUserTried &&
userdata.FirstName != "Unknown") userdata.FirstName != "Unknown")
{ {
string name = userdata.FirstName + " " + userdata.LastName; string name = userdata.FirstName + " " + userdata.LastName;
ret[uuid] = name;
if(userdata.HasGridUserTried)
ret[uuid] = name;
else
{
untried[uuid] = name;
missing.Add(id);
}
} }
else else
missing.Add(id); missing.Add(id);
@ -527,6 +534,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
string name = uac.FirstName + " " + uac.LastName; string name = uac.FirstName + " " + uac.LastName;
ret[uac.PrincipalID] = name; ret[uac.PrincipalID] = name;
missing.Remove(uac.PrincipalID.ToString()); // slowww missing.Remove(uac.PrincipalID.ToString()); // slowww
untried.Remove(uac.PrincipalID);
userdata = new UserData(); userdata = new UserData();
userdata.Id = uac.PrincipalID; userdata.Id = uac.PrincipalID;
@ -567,6 +575,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
string name = first.Replace(" ", ".") + "." + last.Replace(" ", ".") + " @" + new Uri(url).Authority; string name = first.Replace(" ", ".") + "." + last.Replace(" ", ".") + " @" + new Uri(url).Authority;
ret[u] = name; ret[u] = name;
missing.Remove(u.ToString()); missing.Remove(u.ToString());
untried.Remove(u);
} }
catch catch
{ {
@ -577,6 +586,16 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
} }
} }
// add the untried in cache that still failed
if(untried.Count > 0)
{
foreach(KeyValuePair<UUID, string> kvp in untried)
{
ret[kvp.Key] = kvp.Value;
missing.Remove(kvp.Key.ToString());
}
}
// add the UMMthings ( not sure we should) // add the UMMthings ( not sure we should)
if(missing.Count > 0) if(missing.Count > 0)
{ {