From 9e12ef92344d43356ae276ae3a03921e26986a38 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 5 May 2017 01:39:38 +0100 Subject: let all clients get a group title update on create group --- OpenSim/Addons/Groups/GroupsModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Addons') diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index 0e3a172..5b76e0a 100644 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs @@ -787,7 +787,7 @@ namespace OpenSim.Groups remoteClient.SendCreateGroupReply(groupID, true, "Group created successfully"); // Update the founder with new group information. - SendAgentGroupDataUpdate(remoteClient, false); + SendAgentGroupDataUpdate(remoteClient, true); } else remoteClient.SendCreateGroupReply(groupID, false, reason); -- cgit v1.1 From d0912b61516914f810ba306641aaaa813134462e Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 7 May 2017 00:47:45 +0100 Subject: let StreamReader be in using statements --- OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | 7 ++++--- OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'OpenSim/Addons') diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index af00770..51f3ec1 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs @@ -115,9 +115,10 @@ namespace OpenSim.Groups protected override byte[] ProcessRequest(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) { - StreamReader sr = new StreamReader(requestData); - string body = sr.ReadToEnd(); - sr.Close(); + string body; + using(StreamReader sr = new StreamReader(requestData)) + body = sr.ReadToEnd(); + body = body.Trim(); //m_log.DebugFormat("[XXX]: query String: {0}", body); diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs index 598e7a5..8502bb5 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs @@ -91,9 +91,10 @@ namespace OpenSim.Groups protected override byte[] ProcessRequest(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) { - StreamReader sr = new StreamReader(requestData); - string body = sr.ReadToEnd(); - sr.Close(); + string body; + using(StreamReader sr = new StreamReader(requestData)) + body = sr.ReadToEnd(); + body = body.Trim(); //m_log.DebugFormat("[XXX]: query String: {0}", body); -- cgit v1.1 From e0fd9661864da635504e0488dfff0631b595bd6d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 12 Nov 2017 02:51:59 +0000 Subject: off line module V2 must not sent a empty mutes list. That is mutes modules job (or let viewers use they cached entries if none) --- OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'OpenSim/Addons') diff --git a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs index 5340bcd..d8164e7 100644 --- a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs +++ b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs @@ -114,7 +114,6 @@ namespace OpenSim.OfflineIM scene.ForEachClient(delegate(IClientAPI client) { client.OnRetrieveInstantMessages -= RetrieveInstantMessages; - client.OnMuteListRequest -= OnMuteListRequest; }); } @@ -162,7 +161,6 @@ namespace OpenSim.OfflineIM private void OnNewClient(IClientAPI client) { client.OnRetrieveInstantMessages += RetrieveInstantMessages; - client.OnMuteListRequest += OnMuteListRequest; } private void RetrieveInstantMessages(IClientAPI client) @@ -194,20 +192,6 @@ namespace OpenSim.OfflineIM } } - // Apparently this is needed in order for the viewer to request the IMs. - private void OnMuteListRequest(IClientAPI client, uint crc) - { - m_log.DebugFormat("[OfflineIM.V2] Got mute list request for crc {0}", crc); - string filename = "mutes" + client.AgentId.ToString(); - - IXfer xfer = client.Scene.RequestModuleInterface(); - if (xfer != null) - { - xfer.AddNewFile(filename, new Byte[0]); - client.SendMuteListUpdate(filename); - } - } - private void UndeliveredMessage(GridInstantMessage im) { if (im.dialog != (byte)InstantMessageDialog.MessageFromObject && -- cgit v1.1 From 334986ddc62fb29a595381c6cef62474543da1a1 Mon Sep 17 00:00:00 2001 From: fly-man- Date: Fri, 13 Jul 2018 15:59:28 +0200 Subject: Group Powers changed and Officers role brought back for Groups Signed-off-by: UbitUmarov --- OpenSim/Addons/Groups/Service/GroupsService.cs | 111 +++++++++++++------------ 1 file changed, 60 insertions(+), 51 deletions(-) (limited to 'OpenSim/Addons') diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index ea0fedd..c7763c9 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs @@ -51,52 +51,56 @@ namespace OpenSim.Groups GroupPowers.StartProposal | GroupPowers.VoteOnProposal; - public const GroupPowers OwnerPowers = GroupPowers.Accountable | - GroupPowers.AllowEditLand | - GroupPowers.AllowFly | - GroupPowers.AllowLandmark | - GroupPowers.AllowRez | - GroupPowers.AllowSetHome | - GroupPowers.AllowVoiceChat | - GroupPowers.AssignMember | - GroupPowers.AssignMemberLimited | - GroupPowers.ChangeActions | - GroupPowers.ChangeIdentity | - GroupPowers.ChangeMedia | - GroupPowers.ChangeOptions | - GroupPowers.CreateRole | - GroupPowers.DeedObject | - GroupPowers.DeleteRole | - GroupPowers.Eject | - GroupPowers.FindPlaces | - GroupPowers.HostEvent | - GroupPowers.Invite | - GroupPowers.JoinChat | - GroupPowers.LandChangeIdentity | - GroupPowers.LandDeed | - GroupPowers.LandDivideJoin | - GroupPowers.LandEdit | - GroupPowers.LandEjectAndFreeze | - GroupPowers.LandGardening | - GroupPowers.LandManageAllowed | - GroupPowers.LandManageBanned | - GroupPowers.LandManagePasses | - GroupPowers.LandOptions | - GroupPowers.LandRelease | - GroupPowers.LandSetSale | - GroupPowers.ModerateChat | - GroupPowers.ObjectManipulate | - GroupPowers.ObjectSetForSale | - GroupPowers.ReceiveNotices | - GroupPowers.RemoveMember | - GroupPowers.ReturnGroupOwned | - GroupPowers.ReturnGroupSet | - GroupPowers.ReturnNonGroup | - GroupPowers.RoleProperties | - GroupPowers.SendNotices | - GroupPowers.SetLandingPoint | - GroupPowers.StartProposal | - GroupPowers.VoteOnProposal; + public const GroupPowers OfficersPowers = + (GroupPowers)DefaultEveryonePowers | + GroupPowers.AllowFly | + GroupPowers.AllowLandmark | + GroupPowers.AllowRez | + GroupPowers.AssignMemberLimited | + GroupPowers.ChangeIdentity | + GroupPowers.ChangeMedia | + GroupPowers.ChangeOptions | + GroupPowers.DeedObject | + GroupPowers.Eject | + GroupPowers.FindPlaces | + GroupPowers.Invite | + GroupPowers.LandChangeIdentity | + GroupPowers.LandDeed | + GroupPowers.LandDivideJoin | + GroupPowers.LandEdit | + GroupPowers.LandEjectAndFreeze | + GroupPowers.LandGardening | + GroupPowers.LandManageAllowed | + GroupPowers.LandManageBanned | + GroupPowers.LandManagePasses | + GroupPowers.LandOptions | + GroupPowers.LandRelease | + GroupPowers.LandSetSale | + GroupPowers.MemberVisible | + GroupPowers.ModerateChat | + GroupPowers.ObjectManipulate | + GroupPowers.ObjectSetForSale | + GroupPowers.ReturnGroupOwned | + GroupPowers.ReturnGroupSet | + GroupPowers.ReturnNonGroup | + GroupPowers.RoleProperties | + GroupPowers.SendNotices | + GroupPowers.SetLandingPoint; + + + public const GroupPowers OwnerPowers = + (GroupPowers)OfficersPowers | + GroupPowers.Accountable | + GroupPowers.AllowEditLand | + GroupPowers.AssignMember | + GroupPowers.ChangeActions | + GroupPowers.CreateRole | + GroupPowers.DeleteRole | + GroupPowers.ExperienceAdmin | + GroupPowers.ExperienceCreator | + GroupPowers.GroupBanAccess | + GroupPowers.HostEvent | + GroupPowers.RemoveMember; #region Daily Cleanup @@ -151,20 +155,25 @@ namespace OpenSim.Groups data.Data["ShowInList"] = showInList ? "1" : "0"; data.Data["AllowPublish"] = allowPublish ? "1" : "0"; data.Data["MaturePublish"] = maturePublish ? "1" : "0"; - UUID roleID = UUID.Random(); - data.Data["OwnerRoleID"] = roleID.ToString(); + UUID ownerRoleID = UUID.Random(); + data.Data["OwnerRoleID"] = ownerRoleID.ToString(); if (!m_Database.StoreGroup(data)) return UUID.Zero; // 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 - _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 - _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, roleID); + _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, ownerRoleID); + _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, officersRoleID); return data.GroupID; } -- cgit v1.1 From a235a281329e21e3db9f4629ed621996f1e9abd8 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 13 Jul 2018 23:03:26 +0100 Subject: minor changes to last patch --- OpenSim/Addons/Groups/Service/GroupsService.cs | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'OpenSim/Addons') 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 { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public const GroupPowers DefaultEveryonePowers = GroupPowers.AllowSetHome | - GroupPowers.Accountable | - GroupPowers.JoinChat | - GroupPowers.AllowVoiceChat | - GroupPowers.ReceiveNotices | - GroupPowers.StartProposal | - GroupPowers.VoteOnProposal; - - public const GroupPowers OfficersPowers = - (GroupPowers)DefaultEveryonePowers | + public const GroupPowers DefaultEveryonePowers = + GroupPowers.AllowSetHome | + GroupPowers.Accountable | + GroupPowers.JoinChat | + GroupPowers.AllowVoiceChat | + GroupPowers.ReceiveNotices | + GroupPowers.StartProposal | + GroupPowers.VoteOnProposal; + + public const GroupPowers OfficersPowers = DefaultEveryonePowers | GroupPowers.AllowFly | GroupPowers.AllowLandmark | GroupPowers.AllowRez | @@ -87,9 +87,7 @@ namespace OpenSim.Groups GroupPowers.SendNotices | GroupPowers.SetLandingPoint; - - public const GroupPowers OwnerPowers = - (GroupPowers)OfficersPowers | + public const GroupPowers OwnerPowers = OfficersPowers | GroupPowers.Accountable | GroupPowers.AllowEditLand | GroupPowers.AssignMember | @@ -852,7 +850,7 @@ namespace OpenSim.Groups return false; } - if (!add && data == null) // it deosn't exist, can't update + if (!add && data == null) // it dosn't exist, can't update { m_log.DebugFormat("[Groups]: Group {0} doesn't exist. Can't update it", groupID); return false; -- cgit v1.1 From 8ed4bee521d9736abd753ed1e72c7e0461e49846 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 14 Jul 2018 00:46:47 +0100 Subject: mantis 8333: kept idea but my own code. With ini setting ConsoleHistoryTimeStamp set to true, the console history file will have timestamps. Im lazy date is in en-us culture for now. (robust also) --- OpenSim/Addons/Groups/Service/GroupsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Addons') diff --git a/OpenSim/Addons/Groups/Service/GroupsService.cs b/OpenSim/Addons/Groups/Service/GroupsService.cs index 38f87a2..bed91d9 100644 --- a/OpenSim/Addons/Groups/Service/GroupsService.cs +++ b/OpenSim/Addons/Groups/Service/GroupsService.cs @@ -850,7 +850,7 @@ namespace OpenSim.Groups return false; } - if (!add && data == null) // it dosn't exist, can't update + if (!add && data == null) // it doesn't exist, can't update { m_log.DebugFormat("[Groups]: Group {0} doesn't exist. Can't update it", groupID); return false; -- cgit v1.1