From f44742f75f6ea8b9e641a3f319f63afcfdbe26b9 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 21 Oct 2008 22:54:31 +0000 Subject: Pare the groups module down to basics. Adjust dependent files so that a real groups module can even be implemented. --- OpenSim/Framework/GroupData.cs | 57 +++++++++++++++++++++++++++++ OpenSim/Framework/IClientAPI.cs | 2 +- OpenSim/Framework/LLGroup.cs | 80 ----------------------------------------- 3 files changed, 58 insertions(+), 81 deletions(-) create mode 100644 OpenSim/Framework/GroupData.cs delete mode 100644 OpenSim/Framework/LLGroup.cs (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/GroupData.cs b/OpenSim/Framework/GroupData.cs new file mode 100644 index 0000000..66b1875 --- /dev/null +++ b/OpenSim/Framework/GroupData.cs @@ -0,0 +1,57 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + +using System; +using System.Collections; +using OpenMetaverse; +using System.Collections.Generic; +using System.Text; + +namespace OpenSim.Framework +{ + public class GroupMembershipData + { + // Group base data + // + public UUID GroupID; + public string GroupName; + public bool AllowPublish = true; + public bool MaturePublish = true; + public UUID Charter = UUID.Zero; + public UUID FounderID = UUID.Zero; + public UUID GroupPicture = UUID.Zero; + public int MembershipFee = 0; + public bool OpenEnrollment = true; + + // Per user data + // + public bool AcceptNotices = true; + public int Contribution = 0; + public uint GroupPowers = 0; + } +} 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 void SendAdminResponse(UUID Token, uint AdminLevel); - void SendGroupMembership(GroupData[] GroupMembership); + void SendGroupMembership(GroupMembershipData[] GroupMembership); void SendGroupNameReply(UUID groupLLUID, string GroupName); diff --git a/OpenSim/Framework/LLGroup.cs b/OpenSim/Framework/LLGroup.cs deleted file mode 100644 index 7405b97..0000000 --- a/OpenSim/Framework/LLGroup.cs +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSim Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - -using System; -using System.Collections; -using OpenMetaverse; -using System.Collections.Generic; -using System.Text; - -namespace OpenSim.Framework -{ - public class GroupData - { - public string ActiveGroupTitle; - public UUID GroupID; - public List GroupMembers; - public string groupName; - public uint groupPowers = (uint)(GroupPowers.AllowLandmark | GroupPowers.AllowSetHome); - public List GroupTitles; - public bool AcceptNotices = true; - public bool AllowPublish = true; - public string Charter = "Cool Group Yeah!"; - public int contribution = 0; - public UUID FounderID = UUID.Zero; - public int groupMembershipCost = 0; - public int groupRollsCount = 1; - public UUID GroupPicture = UUID.Zero; - public bool MaturePublish = true; - public int MembershipFee = 0; - public bool OpenEnrollment = true; - public bool ShowInList = true; - - public GroupData() - { - GroupTitles = new List(); - GroupMembers = new List(); - } - - public GroupPowers ActiveGroupPowers - { - set { groupPowers = (uint)value; } - get { return (GroupPowers)groupPowers; } - } - } - - public class GroupList - { - public List m_GroupList; - - public GroupList() - { - m_GroupList = new List(); - } - } -} -- cgit v1.1