aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-02-03 23:40:32 +0000
committerJustin Clark-Casey (justincc)2015-02-03 23:43:30 +0000
commit1d2616e7a24882b197de0db3d76c1e02a7cfcd90 (patch)
tree8ba2f006e029528345f1cb279ac0399ac52e9d90 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
parentcorrect some minor comment misspellings in last commit (diff)
downloadopensim-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 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 527ca35..81cef5b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -265,6 +265,7 @@ namespace OpenSim.Region.Framework.Scenes
265 for (int i = 0; i < parts.Length; i++) 265 for (int i = 0; i < parts.Length; i++)
266 { 266 {
267 SceneObjectPart part = parts[i]; 267 SceneObjectPart part = parts[i];
268// m_log.DebugFormat("[SCENE OBJECT GROUP INVENTORY]: Effective perms of {0} are {1}", part.Name, (OpenMetaverse.PermissionMask)part.OwnerMask);
268 ownerMask &= part.OwnerMask; 269 ownerMask &= part.OwnerMask;
269 perms &= part.Inventory.MaskEffectivePermissions(); 270 perms &= part.Inventory.MaskEffectivePermissions();
270 } 271 }