diff options
author | UbitUmarov | 2017-05-04 12:35:42 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-04 12:36:08 +0100 |
commit | 04a50b47bfe2b10dfaad9fd67c2247ae40e97d84 (patch) | |
tree | 872e73fae526aa6d58da7b85d649558859525f2e /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |
parent | do the same in the cases we are just moving parts around and not changing th... (diff) | |
download | opensim-SC-04a50b47bfe2b10dfaad9fd67c2247ae40e97d84.zip opensim-SC-04a50b47bfe2b10dfaad9fd67c2247ae40e97d84.tar.gz opensim-SC-04a50b47bfe2b10dfaad9fd67c2247ae40e97d84.tar.bz2 opensim-SC-04a50b47bfe2b10dfaad9fd67c2247ae40e97d84.tar.xz |
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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 7 |
1 files changed, 3 insertions, 4 deletions
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 | |||
350 | uint everyone = rootEveryonePerms; | 350 | uint everyone = rootEveryonePerms; |
351 | 351 | ||
352 | bool needUpdate = false; | 352 | bool needUpdate = false; |
353 | bool propGroupOut = Scene.PropagateGroupShareOutwards; | ||
354 | // date is time of writing april 30th 2017 | 353 | // date is time of writing april 30th 2017 |
355 | bool propAnyOut = Scene.PropagateAnyOneOutwards & (RootPart.CreationDate == 0 || RootPart.CreationDate > 1493574994); | 354 | bool newobj = (RootPart.CreationDate == 0 || RootPart.CreationDate > 1493574994); |
356 | SceneObjectPart[] parts = m_parts.GetArray(); | 355 | SceneObjectPart[] parts = m_parts.GetArray(); |
357 | for (int i = 0; i < parts.Length; i++) | 356 | for (int i = 0; i < parts.Length; i++) |
358 | { | 357 | { |
@@ -363,9 +362,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
363 | 362 | ||
364 | owner &= part.AggregatedInnerOwnerPerms; | 363 | owner &= part.AggregatedInnerOwnerPerms; |
365 | group &= part.AggregatedInnerGroupPerms; | 364 | group &= part.AggregatedInnerGroupPerms; |
366 | if(propGroupOut) | 365 | if(newobj) |
367 | group &= part.AggregatedInnerGroupPerms; | 366 | group &= part.AggregatedInnerGroupPerms; |
368 | if(propAnyOut) | 367 | if(newobj) |
369 | everyone &= part.AggregatedInnerEveryonePerms; | 368 | everyone &= part.AggregatedInnerEveryonePerms; |
370 | } | 369 | } |
371 | // recover modify and move | 370 | // recover modify and move |