From e37475203bdb78ce0eaab4851c05d5782eda7582 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 19 Jun 2022 11:47:29 +0100 Subject: [PATCH] add usermanagement bool GetUserName(UUID uuid, out string FirstName, out string LastName) --- .../UserManagement/UserManagementModule.cs | 16 +++++++++++++++- OpenSim/Services/Interfaces/IUserManagement.cs | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 4824e1a0b7..1aa32379ca 100755 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs @@ -407,6 +407,20 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement return "UnknownUMM2 " + uuid.ToString(); } + public bool GetUserName(UUID uuid, out string FirstName, out string LastName) + { + if (GetUser(uuid, out UserData user)) + { + FirstName = user.FirstName; + LastName = user.LastName; + return true; + } + + FirstName = string.Empty; + LastName = string.Empty; + return false; + } + public virtual Dictionary GetUsersNames(string[] ids, UUID scopeID) { var ret = new Dictionary(); @@ -1105,7 +1119,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement { if (!oldUser.IsUnknownUser) { - if (homeURL != oldUser.HomeURL && m_DisplayChangingHomeURI) + if (!homeURL.Equals(oldUser.HomeURL) && m_DisplayChangingHomeURI) { m_log.DebugFormat("[USER MANAGEMENT MODULE]: Different HomeURI for {0} {1} ({2}): {3} and {4}", first, last, uuid.ToString(), homeURL, oldUser.HomeURL); diff --git a/OpenSim/Services/Interfaces/IUserManagement.cs b/OpenSim/Services/Interfaces/IUserManagement.cs index c09788bbd9..183343666f 100644 --- a/OpenSim/Services/Interfaces/IUserManagement.cs +++ b/OpenSim/Services/Interfaces/IUserManagement.cs @@ -40,6 +40,7 @@ namespace OpenSim.Framework { UserData GetUserData(UUID id); string GetUserName(UUID uuid); + bool GetUserName(UUID uuid, out string FirstName, out string LastName); string GetUserHomeURL(UUID uuid); string GetUserHomeURL(UUID uuid, out bool failedWeb); string GetUserUUI(UUID uuid);