diff options
author | UbitUmarov | 2017-01-17 01:22:44 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-17 01:22:44 +0000 |
commit | 11134072806f43ddd35fe2a70331a4877ab1b38f (patch) | |
tree | bf573760bda81a9e0442df896f082b8d8440236d /OpenSim/Region/CoreModules/Framework | |
parent | start adding calls to effective permissions aggregation on changes; rearrange... (diff) | |
download | opensim-SC_OLD-11134072806f43ddd35fe2a70331a4877ab1b38f.zip opensim-SC_OLD-11134072806f43ddd35fe2a70331a4877ab1b38f.tar.gz opensim-SC_OLD-11134072806f43ddd35fe2a70331a4877ab1b38f.tar.bz2 opensim-SC_OLD-11134072806f43ddd35fe2a70331a4877ab1b38f.tar.xz |
add more calls to effective permissions aggregation; do not change groupmask on deed
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index b37744d..6783ce0 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -1180,6 +1180,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
1180 | part.NextOwnerMask = item.NextPermissions & part.BaseMask; | 1180 | part.NextOwnerMask = item.NextPermissions & part.BaseMask; |
1181 | } | 1181 | } |
1182 | } | 1182 | } |
1183 | |||
1183 | } | 1184 | } |
1184 | } | 1185 | } |
1185 | else | 1186 | else |
@@ -1198,6 +1199,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
1198 | } | 1199 | } |
1199 | 1200 | ||
1200 | rootPart.TrimPermissions(); | 1201 | rootPart.TrimPermissions(); |
1202 | so.AggregateDeepPerms(); | ||
1201 | 1203 | ||
1202 | if (isAttachment) | 1204 | if (isAttachment) |
1203 | so.FromItemID = item.ID; | 1205 | so.FromItemID = item.ID; |