OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
httptests
UbitUmarov 2017-05-04 12:35:42 +01:00
parent 3402819888
commit 04a50b47bf
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -238,16 +238,6 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public bool LegacySitOffsets = true; public bool LegacySitOffsets = true;
/// <summary>
/// set false to not propagare group rights outwards as legacy did
/// </summary>
public bool PropagateGroupShareOutwards = true;
/// <summary>
/// set false to not propagare Everyone rights outwards as legacy did
/// </summary>
public bool PropagateAnyOneOutwards = true;
/// <summary> /// <summary>
/// Can avatars cross from and to this region? /// Can avatars cross from and to this region?
/// </summary> /// </summary>
@ -990,8 +980,6 @@ namespace OpenSim.Region.Framework.Scenes
// old versions compatibility // old versions compatibility
LegacySitOffsets = startupConfig.GetBoolean("LegacySitOffsets", LegacySitOffsets); LegacySitOffsets = startupConfig.GetBoolean("LegacySitOffsets", LegacySitOffsets);
PropagateGroupShareOutwards = startupConfig.GetBoolean("PropagateGroupShareOutwards", PropagateGroupShareOutwards);
PropagateAnyOneOutwards = startupConfig.GetBoolean("PropagateAnyOneOutwards", PropagateAnyOneOutwards);
if (m_defaultDrawDistance > m_maxDrawDistance) if (m_defaultDrawDistance > m_maxDrawDistance)
m_defaultDrawDistance = m_maxDrawDistance; m_defaultDrawDistance = m_maxDrawDistance;

7
OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
View File

@ -350,9 +350,8 @@ namespace OpenSim.Region.Framework.Scenes
uint everyone = rootEveryonePerms; uint everyone = rootEveryonePerms;
bool needUpdate = false; bool needUpdate = false;
bool propGroupOut = Scene.PropagateGroupShareOutwards;
// date is time of writing april 30th 2017 // 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(); SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++) for (int i = 0; i < parts.Length; i++)
{ {
@ -363,9 +362,9 @@ namespace OpenSim.Region.Framework.Scenes
owner &= part.AggregatedInnerOwnerPerms; owner &= part.AggregatedInnerOwnerPerms;
group &= part.AggregatedInnerGroupPerms; group &= part.AggregatedInnerGroupPerms;
if(propGroupOut) if(newobj)
group &= part.AggregatedInnerGroupPerms; group &= part.AggregatedInnerGroupPerms;
if(propAnyOut) if(newobj)
everyone &= part.AggregatedInnerEveryonePerms; everyone &= part.AggregatedInnerEveryonePerms;
} }
// recover modify and move // recover modify and move