From 8b5b251d1ae22656815217d96585c4798796db52 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 20 Oct 2018 14:10:56 +0100 Subject: [PATCH] mantis 8398: fix with previus commits; removed redundante code --- .../Shared/Api/Implementation/OSSL_Api.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 34639b08b2..20ab7d22f9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -2413,15 +2413,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return string.Empty; } - // Check if the user is already cached - + // Check local grid UUID userID = userManager.GetUserIdByName(firstname, lastname); if (userID != UUID.Zero) return userID.ToString(); - // Query for the user - - String realFirstName; String realLastName; String serverURI; + // HG ? + string realFirstName; + string realLastName; + string serverURI; if (Util.ParseForeignAvatarName(firstname, lastname, out realFirstName, out realLastName, out serverURI)) { try @@ -2443,12 +2443,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // m_log.Warn("[osAvatarName2Key] UserAgentServiceConnector - Unable to connect to destination grid ", e); } } - else - { - UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, firstname, lastname); - if (account != null) - return account.PrincipalID.ToString(); - } return UUID.Zero.ToString(); }