aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-21 22:54:31 +0000
committerMelanie Thielker2008-10-21 22:54:31 +0000
commitf44742f75f6ea8b9e641a3f319f63afcfdbe26b9 (patch)
tree0b7d50e885756d0ff1196f0c10ef05e9741419f3 /OpenSim/Framework
parentfixing OpenSim.ini.example for IRC, adding example for Concierge. (diff)
downloadopensim-SC_OLD-f44742f75f6ea8b9e641a3f319f63afcfdbe26b9.zip
opensim-SC_OLD-f44742f75f6ea8b9e641a3f319f63afcfdbe26b9.tar.gz
opensim-SC_OLD-f44742f75f6ea8b9e641a3f319f63afcfdbe26b9.tar.bz2
opensim-SC_OLD-f44742f75f6ea8b9e641a3f319f63afcfdbe26b9.tar.xz
Pare the groups module down to basics. Adjust dependent files so that a
real groups module can even be implemented.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/GroupData.cs (renamed from OpenSim/Framework/LLGroup.cs)45
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
2 files changed, 12 insertions, 35 deletions
diff --git a/OpenSim/Framework/LLGroup.cs b/OpenSim/Framework/GroupData.cs
index 7405b97..66b1875 100644
--- a/OpenSim/Framework/LLGroup.cs
+++ b/OpenSim/Framework/GroupData.cs
@@ -34,47 +34,24 @@ using System.Text;
34 34
35namespace OpenSim.Framework 35namespace OpenSim.Framework
36{ 36{
37 public class GroupData 37 public class GroupMembershipData
38 { 38 {
39 public string ActiveGroupTitle; 39 // Group base data
40 //
40 public UUID GroupID; 41 public UUID GroupID;
41 public List<UUID> GroupMembers; 42 public string GroupName;
42 public string groupName;
43 public uint groupPowers = (uint)(GroupPowers.AllowLandmark | GroupPowers.AllowSetHome);
44 public List<string> GroupTitles;
45 public bool AcceptNotices = true;
46 public bool AllowPublish = true; 43 public bool AllowPublish = true;
47 public string Charter = "Cool Group Yeah!"; 44 public bool MaturePublish = true;
48 public int contribution = 0; 45 public UUID Charter = UUID.Zero;
49 public UUID FounderID = UUID.Zero; 46 public UUID FounderID = UUID.Zero;
50 public int groupMembershipCost = 0;
51 public int groupRollsCount = 1;
52 public UUID GroupPicture = UUID.Zero; 47 public UUID GroupPicture = UUID.Zero;
53 public bool MaturePublish = true;
54 public int MembershipFee = 0; 48 public int MembershipFee = 0;
55 public bool OpenEnrollment = true; 49 public bool OpenEnrollment = true;
56 public bool ShowInList = true;
57 50
58 public GroupData() 51 // Per user data
59 { 52 //
60 GroupTitles = new List<string>(); 53 public bool AcceptNotices = true;
61 GroupMembers = new List<UUID>(); 54 public int Contribution = 0;
62 } 55 public uint GroupPowers = 0;
63
64 public GroupPowers ActiveGroupPowers
65 {
66 set { groupPowers = (uint)value; }
67 get { return (GroupPowers)groupPowers; }
68 }
69 }
70
71 public class GroupList
72 {
73 public List<UUID> m_GroupList;
74
75 public GroupList()
76 {
77 m_GroupList = new List<UUID>();
78 }
79 } 56 }
80} 57}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index bf31a78..a8813c9 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -845,7 +845,7 @@ namespace OpenSim.Framework
845 845
846 void SendAdminResponse(UUID Token, uint AdminLevel); 846 void SendAdminResponse(UUID Token, uint AdminLevel);
847 847
848 void SendGroupMembership(GroupData[] GroupMembership); 848 void SendGroupMembership(GroupMembershipData[] GroupMembership);
849 849
850 void SendGroupNameReply(UUID groupLLUID, string GroupName); 850 void SendGroupNameReply(UUID groupLLUID, string GroupName);
851 851