From 89ccd601b1579d7168300a6446b53f76b84b0553 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 8 Oct 2020 22:24:10 +0100 Subject: [PATCH] osInviteToGroup: mk sure avatar is really in same region; return value 2 if avatar is already member of the group --- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 27799ed027..5a906b4b69 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -4095,11 +4095,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // invited agent has to be present in this scene ScenePresence sp = World.GetScenePresence(agent); - if (sp == null || !sp.ControllingClient.IsActive) + if (sp == null || sp.IsNPC || sp.IsChildAgent || !sp.ControllingClient.IsActive) return ScriptBaseClass.FALSE; if (sp.ControllingClient.IsGroupMember(m_host.GroupID)) - return ScriptBaseClass.TRUE; + return 2; // object owner has to be in that group and required permissions GroupMembershipData member = m_groupsModule.GetMembershipData(m_host.GroupID, m_host.OwnerID);