diff options
author | Justin Clark-Casey (justincc) | 2015-02-03 23:40:32 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2015-02-03 23:43:30 +0000 |
commit | 1d2616e7a24882b197de0db3d76c1e02a7cfcd90 (patch) | |
tree | 8ba2f006e029528345f1cb279ac0399ac52e9d90 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | correct some minor comment misspellings in last commit (diff) | |
download | opensim-SC_OLD-1d2616e7a24882b197de0db3d76c1e02a7cfcd90.zip opensim-SC_OLD-1d2616e7a24882b197de0db3d76c1e02a7cfcd90.tar.gz opensim-SC_OLD-1d2616e7a24882b197de0db3d76c1e02a7cfcd90.tar.bz2 opensim-SC_OLD-1d2616e7a24882b197de0db3d76c1e02a7cfcd90.tar.xz |
If the owner of an object is taking a copy from the scene (e.g. via the "take copy" option on a viewer) then only require owner copy perms, not copy and transfer.
This matches Linden Lab behaviour and what was already possible via shift-copy.
Transfer would not apply here as the owner and copier are the same.
This is the only functional change, all other current take copy logic remains the same.
Adds regression tests around relevant take copy cases.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 19e557f..20fe3ce 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2943,6 +2943,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2943 | uint lockMask = ~(uint)(PermissionMask.Move | PermissionMask.Modify); | 2943 | uint lockMask = ~(uint)(PermissionMask.Move | PermissionMask.Modify); |
2944 | uint lockBit = RootPart.OwnerMask & (uint)(PermissionMask.Move | PermissionMask.Modify); | 2944 | uint lockBit = RootPart.OwnerMask & (uint)(PermissionMask.Move | PermissionMask.Modify); |
2945 | RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask); | 2945 | RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask); |
2946 | |||
2947 | // m_log.DebugFormat( | ||
2948 | // "[SCENE OBJECT GROUP]: RootPart.OwnerMask now {0} for {1} in {2}", | ||
2949 | // (OpenMetaverse.PermissionMask)RootPart.OwnerMask, Name, Scene.Name); | ||
2950 | |||
2946 | RootPart.ScheduleFullUpdate(); | 2951 | RootPart.ScheduleFullUpdate(); |
2947 | } | 2952 | } |
2948 | 2953 | ||