ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

forget to flag local users

Browse Source
This commit is contained in:
UbitUmarov
2021-01-07 21:15:22 +00:00
parent 91bfc2f62c
commit 6bcba59439
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -447,9 +447,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
{
string name = uac.FirstName + " " + uac.LastName;
UUID id = uac.PrincipalID;
ret[id] = name;
missing.Remove(uac.PrincipalID.ToString()); // slowww
untried.Remove(uac.PrincipalID);
var userdata = new UserData();
userdata.Id = id;
@@ -457,8 +454,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
userdata.LastName = uac.LastName;
userdata.HomeURL = string.Empty;
userdata.IsUnknownUser = false;
userdata.IsLocal = true;
userdata.HasGridUserTried = true;
m_userCacheByID.Add(id, userdata, 1800000);
ret[id] = name;
missing.Remove(id.ToString()); // slowww
untried.Remove(id);
}
}
}
@@ -586,6 +588,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
userdata.LastName = uac.LastName;
userdata.HomeURL = string.Empty;
userdata.IsUnknownUser = false;
userdata.IsLocal = true;
userdata.HasGridUserTried = true;
m_userCacheByID.Add(id, userdata, 1800000);
@@ -832,18 +835,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
{
if (GetUser(userID, out UserData ud) && ud != null)
{
string homeURL = ud.HomeURL;
string first = ud.FirstName,
last = ud.LastName;
if (ud.LastName.StartsWith("@"))
{
string[] parts = ud.FirstName.Split('.');
if (parts.Length >= 2)
{
first = parts[0];
last = parts[1];
}
uui = userID.ToString() + ";" + homeURL + ";" + first + " " + last;
uui = userID.ToString() + ";" + ud.HomeURL + ";" + parts[0] + " " + parts[1];
else
uui = userID.ToString() + ";" + ud.HomeURL + ";" + ud.FirstName + " " + ud.LastName;
}
else
uui = userID.ToString();