aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Addons
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Addons')
-rw-r--r--OpenSim/Addons/Groups/GroupsMessagingModule.cs2
-rw-r--r--OpenSim/Addons/Groups/GroupsModule.cs4
-rw-r--r--OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs20
-rw-r--r--OpenSim/Addons/Groups/Service/GroupsService.cs140
4 files changed, 84 insertions, 82 deletions
diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index f4d3490..854a125 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -252,7 +252,7 @@ namespace OpenSim.Groups
252 252
253 m_debugEnabled = verbose; 253 m_debugEnabled = verbose;
254 254
255 MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled); 255 MainConsole.Instance.Output("{0} verbose logging set to {1}", null, Name, m_debugEnabled);
256 } 256 }
257 257
258 /// <summary> 258 /// <summary>
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
index a4030aa..327504d 100644
--- a/OpenSim/Addons/Groups/GroupsModule.cs
+++ b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Groups
127 127
128 m_debugEnabled = verbose; 128 m_debugEnabled = verbose;
129 129
130 MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled); 130 MainConsole.Instance.Output("{0} verbose logging set to {1}", null, Name, m_debugEnabled);
131 } 131 }
132 132
133 public void RegionLoaded(Scene scene) 133 public void RegionLoaded(Scene scene)
@@ -249,7 +249,7 @@ namespace OpenSim.Groups
249 // There might be some problem with the thread we're generating this on but not 249 // There might be some problem with the thread we're generating this on but not
250 // doing the update at this time causes problems (Mantis #7920 and #7915) 250 // doing the update at this time causes problems (Mantis #7920 and #7915)
251 // TODO: move sending this update to a later time in the rootification of the client. 251 // TODO: move sending this update to a later time in the rootification of the client.
252 if(!sp.haveGroupInformation) 252 if(!sp.m_haveGroupInformation)
253 SendAgentGroupDataUpdate(sp.ControllingClient, false); 253 SendAgentGroupDataUpdate(sp.ControllingClient, false);
254 } 254 }
255 255
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index 9852581..a1093c9 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -605,14 +605,8 @@ namespace OpenSim.Groups
605 private string AgentUUI(string AgentIDStr) 605 private string AgentUUI(string AgentIDStr)
606 { 606 {
607 UUID AgentID = UUID.Zero; 607 UUID AgentID = UUID.Zero;
608 try 608 if (!UUID.TryParse(AgentIDStr, out AgentID) || AgentID == UUID.Zero)
609 { 609 return UUID.Zero.ToString();
610 AgentID = new UUID(AgentIDStr);
611 }
612 catch (FormatException)
613 {
614 return AgentID.ToString();
615 }
616 610
617 if (m_UserManagement.IsLocalGridUser(AgentID)) 611 if (m_UserManagement.IsLocalGridUser(AgentID))
618 return AgentID.ToString(); 612 return AgentID.ToString();
@@ -636,14 +630,8 @@ namespace OpenSim.Groups
636 private string AgentUUIForOutside(string AgentIDStr) 630 private string AgentUUIForOutside(string AgentIDStr)
637 { 631 {
638 UUID AgentID = UUID.Zero; 632 UUID AgentID = UUID.Zero;
639 try 633 if (!UUID.TryParse(AgentIDStr, out AgentID) || AgentID == UUID.Zero)
640 { 634 return UUID.Zero.ToString();
641 AgentID = new UUID(AgentIDStr);
642 }
643 catch (FormatException)
644 {
645 return AgentID.ToString();
646 }
647 635
648 AgentCircuitData agent = null; 636 AgentCircuitData agent = null;
649 foreach (Scene scene in m_Scenes) 637 foreach (Scene scene in m_Scenes)
diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs
index ea0fedd..b5f8ff5 100644
--- a/OpenSim/Addons/Groups/Service/GroupsService.cs
+++ b/OpenSim/Addons/Groups/Service/GroupsService.cs
@@ -43,60 +43,62 @@ 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 OwnerPowers = GroupPowers.Accountable | 54
55 GroupPowers.AllowEditLand | 55 public const GroupPowers OfficersPowers = DefaultEveryonePowers |
56 GroupPowers.AllowFly | 56 GroupPowers.AllowFly |
57 GroupPowers.AllowLandmark | 57 GroupPowers.AllowLandmark |
58 GroupPowers.AllowRez | 58 GroupPowers.AllowRez |
59 GroupPowers.AllowSetHome | 59 GroupPowers.AssignMemberLimited |
60 GroupPowers.AllowVoiceChat | 60 GroupPowers.ChangeIdentity |
61 GroupPowers.AssignMember | 61 GroupPowers.ChangeMedia |
62 GroupPowers.AssignMemberLimited | 62 GroupPowers.ChangeOptions |
63 GroupPowers.ChangeActions | 63 GroupPowers.DeedObject |
64 GroupPowers.ChangeIdentity | 64 GroupPowers.Eject |
65 GroupPowers.ChangeMedia | 65 GroupPowers.FindPlaces |
66 GroupPowers.ChangeOptions | 66 GroupPowers.Invite |
67 GroupPowers.CreateRole | 67 GroupPowers.LandChangeIdentity |
68 GroupPowers.DeedObject | 68 GroupPowers.LandDeed |
69 GroupPowers.DeleteRole | 69 GroupPowers.LandDivideJoin |
70 GroupPowers.Eject | 70 GroupPowers.LandEdit |
71 GroupPowers.FindPlaces | 71 GroupPowers.LandEjectAndFreeze |
72 GroupPowers.HostEvent | 72 GroupPowers.LandGardening |
73 GroupPowers.Invite | 73 GroupPowers.LandManageAllowed |
74 GroupPowers.JoinChat | 74 GroupPowers.LandManageBanned |
75 GroupPowers.LandChangeIdentity | 75 GroupPowers.LandManagePasses |
76 GroupPowers.LandDeed | 76 GroupPowers.LandOptions |
77 GroupPowers.LandDivideJoin | 77 GroupPowers.LandRelease |
78 GroupPowers.LandEdit | 78 GroupPowers.LandSetSale |
79 GroupPowers.LandEjectAndFreeze | 79 GroupPowers.MemberVisible |
80 GroupPowers.LandGardening | 80 GroupPowers.ModerateChat |
81 GroupPowers.LandManageAllowed | 81 GroupPowers.ObjectManipulate |
82 GroupPowers.LandManageBanned | 82 GroupPowers.ObjectSetForSale |
83 GroupPowers.LandManagePasses | 83 GroupPowers.ReturnGroupOwned |
84 GroupPowers.LandOptions | 84 GroupPowers.ReturnGroupSet |
85 GroupPowers.LandRelease | 85 GroupPowers.ReturnNonGroup |
86 GroupPowers.LandSetSale | 86 GroupPowers.RoleProperties |
87 GroupPowers.ModerateChat | 87 GroupPowers.SendNotices |
88 GroupPowers.ObjectManipulate | 88 GroupPowers.SetLandingPoint;
89 GroupPowers.ObjectSetForSale | 89
90 GroupPowers.ReceiveNotices | 90 public const GroupPowers OwnerPowers = OfficersPowers |
91 GroupPowers.RemoveMember | 91 GroupPowers.Accountable |
92 GroupPowers.ReturnGroupOwned | 92 GroupPowers.AllowEditLand |
93 GroupPowers.ReturnGroupSet | 93 GroupPowers.AssignMember |
94 GroupPowers.ReturnNonGroup | 94 GroupPowers.ChangeActions |
95 GroupPowers.RoleProperties | 95 GroupPowers.CreateRole |
96 GroupPowers.SendNotices | 96 GroupPowers.DeleteRole |
97 GroupPowers.SetLandingPoint | 97 GroupPowers.ExperienceAdmin |
98 GroupPowers.StartProposal | 98 GroupPowers.ExperienceCreator |
99 GroupPowers.VoteOnProposal; 99 GroupPowers.GroupBanAccess |
100 GroupPowers.HostEvent |
101 GroupPowers.RemoveMember;
100 102
101 #region Daily Cleanup 103 #region Daily Cleanup
102 104
@@ -151,20 +153,25 @@ namespace OpenSim.Groups
151 data.Data["ShowInList"] = showInList ? "1" : "0"; 153 data.Data["ShowInList"] = showInList ? "1" : "0";
152 data.Data["AllowPublish"] = allowPublish ? "1" : "0"; 154 data.Data["AllowPublish"] = allowPublish ? "1" : "0";
153 data.Data["MaturePublish"] = maturePublish ? "1" : "0"; 155 data.Data["MaturePublish"] = maturePublish ? "1" : "0";
154 UUID roleID = UUID.Random(); 156 UUID ownerRoleID = UUID.Random();
155 data.Data["OwnerRoleID"] = roleID.ToString(); 157 data.Data["OwnerRoleID"] = ownerRoleID.ToString();
156 158
157 if (!m_Database.StoreGroup(data)) 159 if (!m_Database.StoreGroup(data))
158 return UUID.Zero; 160 return UUID.Zero;
159 161
160 // Create Everyone role 162 // Create Everyone role
161 _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, UUID.Zero, "Everyone", "Everyone in the group", "Member of " + name, (ulong)DefaultEveryonePowers, true); 163 _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, UUID.Zero, "Everyone", "Everyone in the group is in the everyone role.", "Member of " + name, (ulong)DefaultEveryonePowers, true);
164
165 // Create Officers role
166 UUID officersRoleID = UUID.Random();
167 _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, officersRoleID, "Officers", "The officers of the group, with more powers than regular members.", "Officer of " + name, (ulong)OfficersPowers, true);
162 168
163 // Create Owner role 169 // Create Owner role
164 _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, roleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true); 170 _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, ownerRoleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true);
165 171
166 // Add founder to group 172 // Add founder to group
167 _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, roleID); 173 _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, ownerRoleID);
174 _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, officersRoleID);
168 175
169 return data.GroupID; 176 return data.GroupID;
170 } 177 }
@@ -223,15 +230,22 @@ namespace OpenSim.Groups
223 if (d.Data.ContainsKey("Location") && d.Data["Location"] != string.Empty) 230 if (d.Data.ContainsKey("Location") && d.Data["Location"] != string.Empty)
224 continue; 231 continue;
225 232
233 int nmembers = m_Database.MemberCount(d.GroupID);
234 if(nmembers == 0)
235 continue;
236
226 DirGroupsReplyData g = new DirGroupsReplyData(); 237 DirGroupsReplyData g = new DirGroupsReplyData();
227 g.groupID = d.GroupID;
228 238
229 if (d.Data.ContainsKey("Name")) 239 if (d.Data.ContainsKey("Name"))
230 g.groupName = d.Data["Name"]; 240 g.groupName = d.Data["Name"];
231 else 241 else
242 {
232 m_log.DebugFormat("[Groups]: Key Name not found"); 243 m_log.DebugFormat("[Groups]: Key Name not found");
244 continue;
245 }
233 246
234 g.members = m_Database.MemberCount(d.GroupID); 247 g.groupID = d.GroupID;
248 g.members = nmembers;
235 249
236 groups.Add(g); 250 groups.Add(g);
237 } 251 }
@@ -485,7 +499,7 @@ namespace OpenSim.Groups
485 499
486 // check permissions 500 // check permissions
487 bool limited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMemberLimited); 501 bool limited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMemberLimited);
488 bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) | IsOwner(RequestingAgentID, GroupID); 502 bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) || IsOwner(RequestingAgentID, GroupID);
489 if (!limited && !unlimited) 503 if (!limited && !unlimited)
490 { 504 {
491 m_log.DebugFormat("[Groups]: ({0}) Attempt at assigning {1} to role {2} denied because of lack of permission", RequestingAgentID, AgentID, RoleID); 505 m_log.DebugFormat("[Groups]: ({0}) Attempt at assigning {1} to role {2} denied because of lack of permission", RequestingAgentID, AgentID, RoleID);
@@ -843,7 +857,7 @@ namespace OpenSim.Groups
843 return false; 857 return false;
844 } 858 }
845 859
846 if (!add && data == null) // it deosn't exist, can't update 860 if (!add && data == null) // it doesn't exist, can't update
847 { 861 {
848 m_log.DebugFormat("[Groups]: Group {0} doesn't exist. Can't update it", groupID); 862 m_log.DebugFormat("[Groups]: Group {0} doesn't exist. Can't update it", groupID);
849 return false; 863 return false;
generated by cgit v1.1 at 2025-04-04 22:56:34 +0000