From 2cc8b97a2eb3f4ecc12813d70aeaba70b7c38757 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 15 Sep 2021 01:28:27 +0100 Subject: [PATCH] osKey2Name: first look if the avatar is on region already --- .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index f71b0dd4b3..9909f7734a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -2505,10 +2505,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { CheckThreatLevel(ThreatLevel.Low, "osKey2Name"); - UUID key = new UUID(); - - if (UUID.TryParse(id, out key)) + if (UUID.TryParse(id, out UUID key)) { + ScenePresence sp = World.GetScenePresence(key); + if(sp != null) + return sp.Name; + UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, key); if (account != null) return account.Name;