diff options
author | UbitUmarov | 2018-07-13 23:03:26 +0100 |
---|---|---|
committer | UbitUmarov | 2018-07-13 23:03:26 +0100 |
commit | a235a281329e21e3db9f4629ed621996f1e9abd8 (patch) | |
tree | 8674d7fbc0befd262d3c80630431ef21eb30814c /OpenSim/Addons/Groups | |
parent | Group Powers changed and Officers role brought back for Groups (diff) | |
download | opensim-SC-a235a281329e21e3db9f4629ed621996f1e9abd8.zip opensim-SC-a235a281329e21e3db9f4629ed621996f1e9abd8.tar.gz opensim-SC-a235a281329e21e3db9f4629ed621996f1e9abd8.tar.bz2 opensim-SC-a235a281329e21e3db9f4629ed621996f1e9abd8.tar.xz |
minor changes to last patch
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Addons/Groups/Service/GroupsService.cs | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index c7763c9..38f87a2 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs | |||
@@ -43,16 +43,16 @@ namespace OpenSim.Groups | |||
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | public const GroupPowers DefaultEveryonePowers = GroupPowers.AllowSetHome | | 46 | public const GroupPowers DefaultEveryonePowers = |
47 | GroupPowers.Accountable | | 47 | GroupPowers.AllowSetHome | |
48 | GroupPowers.JoinChat | | 48 | GroupPowers.Accountable | |
49 | GroupPowers.AllowVoiceChat | | 49 | GroupPowers.JoinChat | |
50 | GroupPowers.ReceiveNotices | | 50 | GroupPowers.AllowVoiceChat | |
51 | GroupPowers.StartProposal | | 51 | GroupPowers.ReceiveNotices | |
52 | GroupPowers.VoteOnProposal; | 52 | GroupPowers.StartProposal | |
53 | 53 | GroupPowers.VoteOnProposal; | |
54 | public const GroupPowers OfficersPowers = | 54 | |
55 | (GroupPowers)DefaultEveryonePowers | | 55 | public const GroupPowers OfficersPowers = DefaultEveryonePowers | |
56 | GroupPowers.AllowFly | | 56 | GroupPowers.AllowFly | |
57 | GroupPowers.AllowLandmark | | 57 | GroupPowers.AllowLandmark | |
58 | GroupPowers.AllowRez | | 58 | GroupPowers.AllowRez | |
@@ -87,9 +87,7 @@ namespace OpenSim.Groups | |||
87 | GroupPowers.SendNotices | | 87 | GroupPowers.SendNotices | |
88 | GroupPowers.SetLandingPoint; | 88 | GroupPowers.SetLandingPoint; |
89 | 89 | ||
90 | 90 | public const GroupPowers OwnerPowers = OfficersPowers | | |
91 | public const GroupPowers OwnerPowers = | ||
92 | (GroupPowers)OfficersPowers | | ||
93 | GroupPowers.Accountable | | 91 | GroupPowers.Accountable | |
94 | GroupPowers.AllowEditLand | | 92 | GroupPowers.AllowEditLand | |
95 | GroupPowers.AssignMember | | 93 | GroupPowers.AssignMember | |
@@ -852,7 +850,7 @@ namespace OpenSim.Groups | |||
852 | return false; | 850 | return false; |
853 | } | 851 | } |
854 | 852 | ||
855 | if (!add && data == null) // it deosn't exist, can't update | 853 | if (!add && data == null) // it dosn't exist, can't update |
856 | { | 854 | { |
857 | m_log.DebugFormat("[Groups]: Group {0} doesn't exist. Can't update it", groupID); | 855 | m_log.DebugFormat("[Groups]: Group {0} doesn't exist. Can't update it", groupID); |
858 | return false; | 856 | return false; |