diff options
author | UbitUmarov | 2017-01-07 16:55:03 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-07 16:55:03 +0000 |
commit | add27a503e2558b7ddeb951d3e42e09b1c04fb36 (patch) | |
tree | 888ab5919cb52f1e0201fc4ab60987a0df022f1f /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Merge branch 'master' into httptests (diff) | |
parent | update permissions module with the new options (diff) | |
download | opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.zip opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.gz opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.bz2 opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b97cceb..99be06b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -5242,6 +5242,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter | |||
5242 | BaseMask &= NextOwnerMask | (uint)PermissionMask.Export; | 5242 | BaseMask &= NextOwnerMask | (uint)PermissionMask.Export; |
5243 | OwnerMask &= NextOwnerMask; | 5243 | OwnerMask &= NextOwnerMask; |
5244 | EveryoneMask &= NextOwnerMask | (uint)PermissionMask.Export; | 5244 | EveryoneMask &= NextOwnerMask | (uint)PermissionMask.Export; |
5245 | GroupMask = 0; // Giving an object zaps group permissions | ||
5245 | 5246 | ||
5246 | Inventory.ApplyNextOwnerPermissions(); | 5247 | Inventory.ApplyNextOwnerPermissions(); |
5247 | } | 5248 | } |