diff options
| author | UbitUmarov | 2017-04-25 17:59:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-04-25 17:59:53 +0100 |
| commit | a680d8b8d700f78beb1a9eea98b52d59118efe2e (patch) | |
| tree | dd084e74fb61400c704a14dcfa8689670acb9ec2 /OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | move mesh pbs creation code out of mesh upload code into to PrimitiveBaseShap... (diff) | |
| download | opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.zip opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.gz opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.bz2 opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEntityInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index 0c4017e..e7c2428 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |||
| @@ -278,6 +278,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 278 | /// <param name="datastore"></param> | 278 | /// <param name="datastore"></param> |
| 279 | void ProcessInventoryBackup(ISimulationDataService datastore); | 279 | void ProcessInventoryBackup(ISimulationDataService datastore); |
| 280 | 280 | ||
| 281 | void AggregateInnerPerms(ref uint owner, ref uint group, ref uint everyone); | ||
| 282 | |||
| 281 | uint MaskEffectivePermissions(); | 283 | uint MaskEffectivePermissions(); |
| 282 | 284 | ||
| 283 | void ApplyNextOwnerPermissions(); | 285 | void ApplyNextOwnerPermissions(); |