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

Put a scope un users. Should fix Unknown UserUMMAU43 unless the user IS unknown

Browse Source
This commit is contained in:
Melanie Thielker
2019-08-07 18:19:56 +01:00
parent ba680ceecb
commit c3e74d9e04
6 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs Normal file → Executable file
View File

@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
// instead drop the request entirely.
if(!client.IsActive)
return;
if (GetUser(uuid, out user))
if (GetUser(uuid, client.ScopeId, out user))
{
if(client.IsActive)
client.SendNameReply(uuid, user.FirstName, user.LastName);
@@ -716,7 +716,12 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
#region Cache Management
public virtual bool GetUser(UUID uuid, out UserData userdata)
{
if(m_Scenes.Count <= 0)
return GetUser(uuid, m_Scenes[0].RegionInfo.ScopeID, out userdata);
}
public virtual bool GetUser(UUID uuid, UUID scopeID, out UserData userdata)
{
if (m_Scenes.Count <= 0)
{
userdata = new UserData();
return false;
@@ -749,7 +754,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
if (!userdata.HasGridUserTried)
{
/* rewrite here */
UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid);
UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(scopeID, uuid);
if (account != null)
{
userdata.FirstName = account.FirstName;