diff options
author | Diva Canto | 2013-04-25 17:01:57 -0700 |
---|---|---|
committer | Diva Canto | 2013-04-25 17:01:57 -0700 |
commit | 0e162511cf0e2b507a94ad91a5e36be76eda18ef (patch) | |
tree | 13e74c8b432830099e2d97c5bd993fe06643fffa /OpenSim | |
parent | Recover a lost "virtual". Downstream projects need this. (diff) | |
download | opensim-SC-0e162511cf0e2b507a94ad91a5e36be76eda18ef.zip opensim-SC-0e162511cf0e2b507a94ad91a5e36be76eda18ef.tar.gz opensim-SC-0e162511cf0e2b507a94ad91a5e36be76eda18ef.tar.bz2 opensim-SC-0e162511cf0e2b507a94ad91a5e36be76eda18ef.tar.xz |
Groups: make some methods protected.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Addons/Groups/Service/GroupsService.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index 0668870..6a4348b 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs | |||
@@ -723,12 +723,12 @@ namespace OpenSim.Groups | |||
723 | 723 | ||
724 | #region Actions without permission checks | 724 | #region Actions without permission checks |
725 | 725 | ||
726 | private void _AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID) | 726 | protected void _AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID) |
727 | { | 727 | { |
728 | _AddAgentToGroup(RequestingAgentID, AgentID, GroupID, RoleID, string.Empty); | 728 | _AddAgentToGroup(RequestingAgentID, AgentID, GroupID, RoleID, string.Empty); |
729 | } | 729 | } |
730 | 730 | ||
731 | public void _RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID) | 731 | protected void _RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID) |
732 | { | 732 | { |
733 | // 1. Delete membership | 733 | // 1. Delete membership |
734 | m_Database.DeleteMember(GroupID, AgentID); | 734 | m_Database.DeleteMember(GroupID, AgentID); |
@@ -780,7 +780,7 @@ namespace OpenSim.Groups | |||
780 | 780 | ||
781 | } | 781 | } |
782 | 782 | ||
783 | private bool _AddOrUpdateGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, bool add) | 783 | protected bool _AddOrUpdateGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, bool add) |
784 | { | 784 | { |
785 | RoleData data = m_Database.RetrieveRole(groupID, roleID); | 785 | RoleData data = m_Database.RetrieveRole(groupID, roleID); |
786 | 786 | ||
@@ -810,12 +810,12 @@ namespace OpenSim.Groups | |||
810 | return m_Database.StoreRole(data); | 810 | return m_Database.StoreRole(data); |
811 | } | 811 | } |
812 | 812 | ||
813 | private void _RemoveGroupRole(UUID groupID, UUID roleID) | 813 | protected void _RemoveGroupRole(UUID groupID, UUID roleID) |
814 | { | 814 | { |
815 | m_Database.DeleteRole(groupID, roleID); | 815 | m_Database.DeleteRole(groupID, roleID); |
816 | } | 816 | } |
817 | 817 | ||
818 | private void _AddAgentToGroupRole(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID) | 818 | protected void _AddAgentToGroupRole(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID) |
819 | { | 819 | { |
820 | RoleMembershipData data = m_Database.RetrieveRoleMember(GroupID, RoleID, AgentID); | 820 | RoleMembershipData data = m_Database.RetrieveRoleMember(GroupID, RoleID, AgentID); |
821 | if (data != null) | 821 | if (data != null) |
@@ -840,7 +840,7 @@ namespace OpenSim.Groups | |||
840 | 840 | ||
841 | } | 841 | } |
842 | 842 | ||
843 | private List<GroupRolesData> _GetGroupRoles(UUID groupID) | 843 | protected List<GroupRolesData> _GetGroupRoles(UUID groupID) |
844 | { | 844 | { |
845 | List<GroupRolesData> roles = new List<GroupRolesData>(); | 845 | List<GroupRolesData> roles = new List<GroupRolesData>(); |
846 | 846 | ||
@@ -865,7 +865,7 @@ namespace OpenSim.Groups | |||
865 | return roles; | 865 | return roles; |
866 | } | 866 | } |
867 | 867 | ||
868 | private List<ExtendedGroupRoleMembersData> _GetGroupRoleMembers(UUID GroupID, bool isInGroup) | 868 | protected List<ExtendedGroupRoleMembersData> _GetGroupRoleMembers(UUID GroupID, bool isInGroup) |
869 | { | 869 | { |
870 | List<ExtendedGroupRoleMembersData> rmembers = new List<ExtendedGroupRoleMembersData>(); | 870 | List<ExtendedGroupRoleMembersData> rmembers = new List<ExtendedGroupRoleMembersData>(); |
871 | 871 | ||