diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 205a321112..e709d6cbed 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -238,16 +238,6 @@ namespace OpenSim.Region.Framework.Scenes
///
public bool LegacySitOffsets = true;
- ///
- /// set false to not propagare group rights outwards as legacy did
- ///
- public bool PropagateGroupShareOutwards = true;
-
- ///
- /// set false to not propagare Everyone rights outwards as legacy did
- ///
- public bool PropagateAnyOneOutwards = true;
-
///
/// Can avatars cross from and to this region?
///
@@ -990,8 +980,6 @@ namespace OpenSim.Region.Framework.Scenes
// old versions compatibility
LegacySitOffsets = startupConfig.GetBoolean("LegacySitOffsets", LegacySitOffsets);
- PropagateGroupShareOutwards = startupConfig.GetBoolean("PropagateGroupShareOutwards", PropagateGroupShareOutwards);
- PropagateAnyOneOutwards = startupConfig.GetBoolean("PropagateAnyOneOutwards", PropagateAnyOneOutwards);
if (m_defaultDrawDistance > m_maxDrawDistance)
m_defaultDrawDistance = m_maxDrawDistance;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 6bb92f4844..f778367ce6 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