osInviteToGroup: dont invite if already member (returns TRUE in this case)

This commit is contained in:
UbitUmarov
2020-10-08 21:45:33 +01:00
parent 52b16c34a2
commit c136bcef6e

View File

@@ -4089,14 +4089,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!UUID.TryParse(agentId, out agent))
return ScriptBaseClass.FALSE;
// invited agent has to be present in this scene
if (World.GetScenePresence(agent) == null)
return ScriptBaseClass.FALSE;
// object has to be set to a group, but not group owned
if (m_host.GroupID == UUID.Zero || m_host.GroupID == m_host.OwnerID)
return ScriptBaseClass.FALSE;
// invited agent has to be present in this scene
ScenePresence sp = World.GetScenePresence(agent);
if (sp == null || !sp.ControllingClient.IsActive)
return ScriptBaseClass.FALSE;
if (sp.ControllingClient.IsGroupMember(m_host.GroupID))
return ScriptBaseClass.TRUE;
// object owner has to be in that group and required permissions
GroupMembershipData member = m_groupsModule.GetMembershipData(m_host.GroupID, m_host.OwnerID);
if (member == null || (member.GroupPowers & (ulong)GroupPowers.Invite) == 0)