OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XmlRpcGroup: fix groupNoticesEnabled check

master
UbitUmarov 2020-06-09 00:04:01 +01:00
parent 1a57abebfc
commit 9c55c5bdb2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@ -405,7 +405,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_log.DebugFormat("[xmlGROUPS]: OnInstantMessage called for {0}, message type {1}", m_log.DebugFormat("[xmlGROUPS]: OnInstantMessage called for {0}, message type {1}",
remoteClient.Name, (InstantMessageDialog)im.dialog); remoteClient.Name, (InstantMessageDialog)im.dialog);
if (!m_groupNoticesEnabled || remoteClient == null || !remoteClient.IsActive || remoteClient.AgentId == UUID.Zero) if (remoteClient == null || !remoteClient.IsActive || remoteClient.AgentId == UUID.Zero)
return; return;
Scene scene = (Scene)remoteClient.Scene; Scene scene = (Scene)remoteClient.Scene;
@ -481,6 +481,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// Group notices // Group notices
if ((im.dialog == (byte)InstantMessageDialog.GroupNotice)) if ((im.dialog == (byte)InstantMessageDialog.GroupNotice))
{ {
if (!m_groupNoticesEnabled)
return;
UUID GroupID = new UUID(im.toAgentID); UUID GroupID = new UUID(im.toAgentID);
GroupMembershipData grpMemberData = m_groupData.GetAgentGroupMembership(remoteAgentID, remoteAgentID, GroupID); GroupMembershipData grpMemberData = m_groupData.GetAgentGroupMembership(remoteAgentID, remoteAgentID, GroupID);
if (grpMemberData == null) if (grpMemberData == null)
@ -613,6 +616,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
else if (im.dialog == (byte)InstantMessageDialog.GroupNoticeInventoryAccepted) else if (im.dialog == (byte)InstantMessageDialog.GroupNoticeInventoryAccepted)
{ {
if (!m_groupNoticesEnabled)
return;
UUID noticeID = new UUID(im.imSessionID); UUID noticeID = new UUID(im.imSessionID);
if (m_debugEnabled) if (m_debugEnabled)
@ -678,6 +684,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
else if (im.dialog == (byte)InstantMessageDialog.GroupNoticeInventoryDeclined) else if (im.dialog == (byte)InstantMessageDialog.GroupNoticeInventoryDeclined)
{ {
if (!m_groupNoticesEnabled)
return;
UUID noticeID = new UUID(im.imSessionID); UUID noticeID = new UUID(im.imSessionID);
if (m_debugEnabled) if (m_debugEnabled)