diff options
| author | Justin Clark-Casey (justincc) | 2013-08-05 19:25:51 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-05 19:25:51 +0100 |
| commit | 976514d39a6a4eb2ab8ce8ccc202d742253778a1 (patch) | |
| tree | afeabfbc3aa935753b41fa80d8c76d79b7f1704d | |
| parent | Add checks monitoring framework to provide alerts if certain conditions do no... (diff) | |
| parent | Group notices bug fix: use a new IM for each member of the group, otherwise t... (diff) | |
| download | opensim-SC_OLD-976514d39a6a4eb2ab8ce8ccc202d742253778a1.zip opensim-SC_OLD-976514d39a6a4eb2ab8ce8ccc202d742253778a1.tar.gz opensim-SC_OLD-976514d39a6a4eb2ab8ce8ccc202d742253778a1.tar.bz2 opensim-SC_OLD-976514d39a6a4eb2ab8ce8ccc202d742253778a1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | OpenSim/Addons/Groups/GroupsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index da8030c..830c671 100644 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs | |||
| @@ -467,12 +467,12 @@ namespace OpenSim.Groups | |||
| 467 | } | 467 | } |
| 468 | 468 | ||
| 469 | // Send notice out to everyone that wants notices | 469 | // Send notice out to everyone that wants notices |
| 470 | // Build notice IIM | ||
| 471 | GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice); | ||
| 472 | foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), GroupID)) | 470 | foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), GroupID)) |
| 473 | { | 471 | { |
| 474 | if (member.AcceptNotices) | 472 | if (member.AcceptNotices) |
| 475 | { | 473 | { |
| 474 | // Build notice IIM, one of reach, because the sending may be async | ||
| 475 | GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice); | ||
| 476 | msg.toAgentID = member.AgentID.Guid; | 476 | msg.toAgentID = member.AgentID.Guid; |
| 477 | OutgoingInstantMessage(msg, member.AgentID); | 477 | OutgoingInstantMessage(msg, member.AgentID); |
| 478 | } | 478 | } |