diff options
author | Justin Clark-Casey (justincc) | 2010-10-19 01:54:51 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-19 02:04:23 +0100 |
commit | 478b44f231841aafb2ea19d2b21d0d3826456ad7 (patch) | |
tree | 399ea7aae26a5dc7e39fca8889cc9f1ec8620cf3 /OpenSim/Region/OptionalModules/Avatar | |
parent | Display more information when xmlrpcgroupsserver comms fails (diff) | |
download | opensim-SC_OLD-478b44f231841aafb2ea19d2b21d0d3826456ad7.zip opensim-SC_OLD-478b44f231841aafb2ea19d2b21d0d3826456ad7.tar.gz opensim-SC_OLD-478b44f231841aafb2ea19d2b21d0d3826456ad7.tar.bz2 opensim-SC_OLD-478b44f231841aafb2ea19d2b21d0d3826456ad7.tar.xz |
Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC groups module
This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members
Not sure why this wasn't being done before...
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index d178e18..25dba7f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | |||
@@ -212,11 +212,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
212 | 212 | ||
213 | public void SendMessageToGroup(GridInstantMessage im, UUID groupID) | 213 | public void SendMessageToGroup(GridInstantMessage im, UUID groupID) |
214 | { | 214 | { |
215 | List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(UUID.Zero, groupID); | 215 | List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(new UUID(im.fromAgentID), groupID); |
216 | 216 | ||
217 | if (m_debugEnabled) | 217 | if (m_debugEnabled) |
218 | m_log.DebugFormat( | 218 | m_log.DebugFormat( |
219 | "[GROUPS-MESSAGING]: SendMessageToGroup called for group {0} with {1} members", | 219 | "[GROUPS-MESSAGING]: SendMessageToGroup called for group {0} with {1} visible members", |
220 | groupID, groupMembers.Count); | 220 | groupID, groupMembers.Count); |
221 | 221 | ||
222 | foreach (GroupMembersData member in groupMembers) | 222 | foreach (GroupMembersData member in groupMembers) |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 6f044e0..0c8113e 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -599,7 +599,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
599 | 599 | ||
600 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) | 600 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) |
601 | { | 601 | { |
602 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 602 | if (m_debugEnabled) |
603 | m_log.DebugFormat( | ||
604 | "[GROUPS]: GroupMembersRequest called for {0} from client {1}", groupID, remoteClient.Name); | ||
605 | |||
603 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID); | 606 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID); |
604 | 607 | ||
605 | if (m_debugEnabled) | 608 | if (m_debugEnabled) |