OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Group Powers changed and Officers role brought back for Groups 

Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
0.9.1.0-post-fixes
fly-man- 2018-07-13 15:59:28 +02:00 committed by UbitUmarov
parent 3cea21ab63
commit 334986ddc6
1 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
OpenSim/Addons/Groups/Service/GroupsService.cs
View File

@ -51,52 +51,56 @@ namespace OpenSim.Groups
GroupPowers.StartProposal | GroupPowers.StartProposal |
GroupPowers.VoteOnProposal; GroupPowers.VoteOnProposal;
public const GroupPowers OwnerPowers = GroupPowers.Accountable | public const GroupPowers OfficersPowers =
GroupPowers.AllowEditLand | (GroupPowers)DefaultEveryonePowers |
GroupPowers.AllowFly | GroupPowers.AllowFly |
GroupPowers.AllowLandmark | GroupPowers.AllowLandmark |
GroupPowers.AllowRez | GroupPowers.AllowRez |
GroupPowers.AllowSetHome | GroupPowers.AssignMemberLimited |
GroupPowers.AllowVoiceChat | GroupPowers.ChangeIdentity |
GroupPowers.AssignMember | GroupPowers.ChangeMedia |
GroupPowers.AssignMemberLimited | GroupPowers.ChangeOptions |
GroupPowers.ChangeActions | GroupPowers.DeedObject |
GroupPowers.ChangeIdentity | GroupPowers.Eject |
GroupPowers.ChangeMedia | GroupPowers.FindPlaces |
GroupPowers.ChangeOptions | GroupPowers.Invite |
GroupPowers.CreateRole | GroupPowers.LandChangeIdentity |
GroupPowers.DeedObject | GroupPowers.LandDeed |
GroupPowers.DeleteRole | GroupPowers.LandDivideJoin |
GroupPowers.Eject | GroupPowers.LandEdit |
GroupPowers.FindPlaces | GroupPowers.LandEjectAndFreeze |
GroupPowers.HostEvent | GroupPowers.LandGardening |
GroupPowers.Invite | GroupPowers.LandManageAllowed |
GroupPowers.JoinChat | GroupPowers.LandManageBanned |
GroupPowers.LandChangeIdentity | GroupPowers.LandManagePasses |
GroupPowers.LandDeed | GroupPowers.LandOptions |
GroupPowers.LandDivideJoin | GroupPowers.LandRelease |
GroupPowers.LandEdit | GroupPowers.LandSetSale |
GroupPowers.LandEjectAndFreeze | GroupPowers.MemberVisible |
GroupPowers.LandGardening | GroupPowers.ModerateChat |
GroupPowers.LandManageAllowed | GroupPowers.ObjectManipulate |
GroupPowers.LandManageBanned | GroupPowers.ObjectSetForSale |
GroupPowers.LandManagePasses | GroupPowers.ReturnGroupOwned |
GroupPowers.LandOptions | GroupPowers.ReturnGroupSet |
GroupPowers.LandRelease | GroupPowers.ReturnNonGroup |
GroupPowers.LandSetSale | GroupPowers.RoleProperties |
GroupPowers.ModerateChat | GroupPowers.SendNotices |
GroupPowers.ObjectManipulate | GroupPowers.SetLandingPoint;
GroupPowers.ObjectSetForSale |
GroupPowers.ReceiveNotices |
GroupPowers.RemoveMember | public const GroupPowers OwnerPowers =
GroupPowers.ReturnGroupOwned | (GroupPowers)OfficersPowers |
GroupPowers.ReturnGroupSet | GroupPowers.Accountable |
GroupPowers.ReturnNonGroup | GroupPowers.AllowEditLand |
GroupPowers.RoleProperties | GroupPowers.AssignMember |
GroupPowers.SendNotices | GroupPowers.ChangeActions |
GroupPowers.SetLandingPoint | GroupPowers.CreateRole |
GroupPowers.StartProposal | GroupPowers.DeleteRole |
GroupPowers.VoteOnProposal; GroupPowers.ExperienceAdmin |
GroupPowers.ExperienceCreator |
GroupPowers.GroupBanAccess |
GroupPowers.HostEvent |
GroupPowers.RemoveMember;
#region Daily Cleanup #region Daily Cleanup
@ -151,20 +155,25 @@ namespace OpenSim.Groups
data.Data["ShowInList"] = showInList ? "1" : "0"; data.Data["ShowInList"] = showInList ? "1" : "0";
data.Data["AllowPublish"] = allowPublish ? "1" : "0"; data.Data["AllowPublish"] = allowPublish ? "1" : "0";
data.Data["MaturePublish"] = maturePublish ? "1" : "0"; data.Data["MaturePublish"] = maturePublish ? "1" : "0";
UUID roleID = UUID.Random(); UUID ownerRoleID = UUID.Random();
data.Data["OwnerRoleID"] = roleID.ToString(); data.Data["OwnerRoleID"] = ownerRoleID.ToString();
if (!m_Database.StoreGroup(data)) if (!m_Database.StoreGroup(data))
return UUID.Zero; return UUID.Zero;
// Create Everyone role // Create Everyone role
_AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, UUID.Zero, "Everyone", "Everyone in the group", "Member of " + name, (ulong)DefaultEveryonePowers, true); _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, UUID.Zero, "Everyone", "Everyone in the group is in the everyone role.", "Member of " + name, (ulong)DefaultEveryonePowers, true);
// Create Officers role
UUID officersRoleID = UUID.Random();
_AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, officersRoleID, "Officers", "The officers of the group, with more powers than regular members.", "Officer of " + name, (ulong)OfficersPowers, true);
// Create Owner role // Create Owner role
_AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, roleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true); _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, ownerRoleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true);
// Add founder to group // Add founder to group
_AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, roleID); _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, ownerRoleID);
_AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, officersRoleID);
return data.GroupID; return data.GroupID;
} }