diff options
author | Justin Clark-Casey (justincc) | 2014-03-12 19:31:04 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-03-12 19:31:04 +0000 |
commit | beba20846f1935e2769f78fb0c87746cf77a6b50 (patch) | |
tree | cea7c1bce6d3b3938d61620d15ae73cc7b535985 /OpenSim/Region/Framework/Interfaces | |
parent | Enable MapImageServiceModule with no refresh (diff) | |
download | opensim-SC_OLD-beba20846f1935e2769f78fb0c87746cf77a6b50.zip opensim-SC_OLD-beba20846f1935e2769f78fb0c87746cf77a6b50.tar.gz opensim-SC_OLD-beba20846f1935e2769f78fb0c87746cf77a6b50.tar.bz2 opensim-SC_OLD-beba20846f1935e2769f78fb0c87746cf77a6b50.tar.xz |
When sending group notices through group messaging, allow the agent ID to use for fetching group data to be different from im.fromAgentID
This is because xmlrpcgroups currently always checks visibility for the requesting agent ID (unlike Groups v2, which can accept UUID.Zero)
But group notice IMs have a from agent which is the group rather than the sending agent.
Further addresses http://opensimulator.org/mantis/view.php?id=7037
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs index 61bd153..7dc1552 100644 --- a/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsMessagingModule.cs | |||
@@ -83,10 +83,15 @@ namespace OpenSim.Region.Framework.Interfaces | |||
83 | /// dialog - This must be (byte)InstantMessageDialog.SessionSend | 83 | /// dialog - This must be (byte)InstantMessageDialog.SessionSend |
84 | /// </param> | 84 | /// </param> |
85 | /// <param name="groupID"></param> | 85 | /// <param name="groupID"></param> |
86 | /// <param name="sendingAgentForGroupCalls"> | ||
87 | /// The requesting agent to use when querying the groups service. Sometimes this is different from | ||
88 | /// im.fromAgentID, with group notices, for example. | ||
89 | /// </param> | ||
86 | /// <param name="sendCondition"> | 90 | /// <param name="sendCondition"> |
87 | /// The condition that must be met by a member for the message to be sent. If null then the message is sent | 91 | /// The condition that must be met by a member for the message to be sent. If null then the message is sent |
88 | /// if the chat session is active. | 92 | /// if the chat session is active. |
89 | /// </param> | 93 | /// </param> |
90 | void SendMessageToGroup(GridInstantMessage im, UUID groupID, Func<GroupMembersData, bool> sendCondition); | 94 | void SendMessageToGroup( |
95 | GridInstantMessage im, UUID groupID, UUID sendingAgentForGroupCalls, Func<GroupMembersData, bool> sendCondition); | ||
91 | } | 96 | } |
92 | } \ No newline at end of file | 97 | } \ No newline at end of file |