diff options
Diffstat (limited to 'OpenSim/Region')
4 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs index 368f2cd..e357969 100644 --- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
67 | List<GroupRolesData> GroupRoleDataRequest(IClientAPI remoteClient, UUID groupID); | 67 | List<GroupRolesData> GroupRoleDataRequest(IClientAPI remoteClient, UUID groupID); |
68 | List<GroupRoleMembersData> GroupRoleMembersRequest(IClientAPI remoteClient, UUID groupID); | 68 | List<GroupRoleMembersData> GroupRoleMembersRequest(IClientAPI remoteClient, UUID groupID); |
69 | GroupProfileData GroupProfileRequest(IClientAPI remoteClient, UUID groupID); | 69 | GroupProfileData GroupProfileRequest(IClientAPI remoteClient, UUID groupID); |
70 | GroupMembershipData[] GetMembershipData(UUID UserID); | 70 | GroupMembershipData[] GetMembershipData(UUID UserID); |
71 | GroupMembershipData GetMembershipData(UUID GroupID, UUID UserID); | 71 | GroupMembershipData GetMembershipData(UUID GroupID, UUID UserID); |
72 | 72 | ||
73 | void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish); | 73 | void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 93c2d09..8ea4b93 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -711,7 +711,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
711 | 711 | ||
712 | public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID) | 712 | public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID) |
713 | { | 713 | { |
714 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 714 | if (m_debugEnabled) |
715 | m_log.DebugFormat( | ||
716 | "[GROUPS]: {0} called with groupID={1}, agentID={2}", | ||
717 | System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID); | ||
715 | 718 | ||
716 | return m_groupData.GetAgentGroupMembership(null, agentID, groupID); | 719 | return m_groupData.GetAgentGroupMembership(null, agentID, groupID); |
717 | } | 720 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs index 9e0fa2d..621ab28 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs | |||
@@ -55,7 +55,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
55 | GroupInviteInfo GetAgentToGroupInvite(GroupRequestID requestID, UUID inviteID); | 55 | GroupInviteInfo GetAgentToGroupInvite(GroupRequestID requestID, UUID inviteID); |
56 | void RemoveAgentToGroupInvite(GroupRequestID requestID, UUID inviteID); | 56 | void RemoveAgentToGroupInvite(GroupRequestID requestID, UUID inviteID); |
57 | 57 | ||
58 | |||
59 | void AddAgentToGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID); | 58 | void AddAgentToGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID); |
60 | void RemoveAgentFromGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID); | 59 | void RemoveAgentFromGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID); |
61 | List<GroupRolesData> GetAgentGroupRoles(GroupRequestID requestID, UUID AgentID, UUID GroupID); | 60 | List<GroupRolesData> GetAgentGroupRoles(GroupRequestID requestID, UUID AgentID, UUID GroupID); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index 2115376..af1018f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |||
@@ -47,9 +47,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
47 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 47 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
48 | public class XmlRpcGroupsServicesConnectorModule : ISharedRegionModule, IGroupsServicesConnector | 48 | public class XmlRpcGroupsServicesConnectorModule : ISharedRegionModule, IGroupsServicesConnector |
49 | { | 49 | { |
50 | private static readonly ILog m_log = | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
52 | |||
53 | 51 | ||
54 | public const GroupPowers m_DefaultEveryonePowers = GroupPowers.AllowSetHome | | 52 | public const GroupPowers m_DefaultEveryonePowers = GroupPowers.AllowSetHome | |
55 | GroupPowers.Accountable | | 53 | GroupPowers.Accountable | |
@@ -530,7 +528,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
530 | return HashTableToGroupMembershipData(respData); | 528 | return HashTableToGroupMembershipData(respData); |
531 | } | 529 | } |
532 | 530 | ||
533 | |||
534 | public List<GroupMembershipData> GetAgentGroupMemberships(GroupRequestID requestID, UUID AgentID) | 531 | public List<GroupMembershipData> GetAgentGroupMemberships(GroupRequestID requestID, UUID AgentID) |
535 | { | 532 | { |
536 | Hashtable param = new Hashtable(); | 533 | Hashtable param = new Hashtable(); |
@@ -777,7 +774,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
777 | 774 | ||
778 | private GroupRecord GroupProfileHashtableToGroupRecord(Hashtable groupProfile) | 775 | private GroupRecord GroupProfileHashtableToGroupRecord(Hashtable groupProfile) |
779 | { | 776 | { |
780 | |||
781 | GroupRecord group = new GroupRecord(); | 777 | GroupRecord group = new GroupRecord(); |
782 | group.GroupID = UUID.Parse((string)groupProfile["GroupID"]); | 778 | group.GroupID = UUID.Parse((string)groupProfile["GroupID"]); |
783 | group.GroupName = groupProfile["Name"].ToString(); | 779 | group.GroupName = groupProfile["Name"].ToString(); |
@@ -796,6 +792,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
796 | 792 | ||
797 | return group; | 793 | return group; |
798 | } | 794 | } |
795 | |||
799 | private static GroupMembershipData HashTableToGroupMembershipData(Hashtable respData) | 796 | private static GroupMembershipData HashTableToGroupMembershipData(Hashtable respData) |
800 | { | 797 | { |
801 | GroupMembershipData data = new GroupMembershipData(); | 798 | GroupMembershipData data = new GroupMembershipData(); |
@@ -828,6 +825,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
828 | data.MembershipFee = int.Parse((string)respData["MembershipFee"]); | 825 | data.MembershipFee = int.Parse((string)respData["MembershipFee"]); |
829 | data.OpenEnrollment = ((string)respData["OpenEnrollment"] == "1"); | 826 | data.OpenEnrollment = ((string)respData["OpenEnrollment"] == "1"); |
830 | data.ShowInList = ((string)respData["ShowInList"] == "1"); | 827 | data.ShowInList = ((string)respData["ShowInList"] == "1"); |
828 | |||
831 | return data; | 829 | return data; |
832 | } | 830 | } |
833 | 831 | ||