From 04a50b47bfe2b10dfaad9fd67c2247ae40e97d84 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 4 May 2017 12:35:42 +0100 Subject: the new options i add where actually bad idea, they would make the compatibility issue ethernal. Removed and extended the ugly date hack to group share outwards propagation, until a better way is found at least --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index 6bb92f4..f778367 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs @@ -350,9 +350,8 @@ namespace OpenSim.Region.Framework.Scenes uint everyone = rootEveryonePerms; bool needUpdate = false; - bool propGroupOut = Scene.PropagateGroupShareOutwards; // date is time of writing april 30th 2017 - bool propAnyOut = Scene.PropagateAnyOneOutwards & (RootPart.CreationDate == 0 || RootPart.CreationDate > 1493574994); + bool newobj = (RootPart.CreationDate == 0 || RootPart.CreationDate > 1493574994); SceneObjectPart[] parts = m_parts.GetArray(); for (int i = 0; i < parts.Length; i++) { @@ -363,9 +362,9 @@ namespace OpenSim.Region.Framework.Scenes owner &= part.AggregatedInnerOwnerPerms; group &= part.AggregatedInnerGroupPerms; - if(propGroupOut) + if(newobj) group &= part.AggregatedInnerGroupPerms; - if(propAnyOut) + if(newobj) everyone &= part.AggregatedInnerEveryonePerms; } // recover modify and move -- cgit v1.1