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/CoreModules/Framework | |
parent | correct some minor comment misspellings in last commit (diff) | |
download | opensim-SC-1d2616e7a24882b197de0db3d76c1e02a7cfcd90.zip opensim-SC-1d2616e7a24882b197de0db3d76c1e02a7cfcd90.tar.gz opensim-SC-1d2616e7a24882b197de0db3d76c1e02a7cfcd90.tar.bz2 opensim-SC-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/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index f958510..a77bc63 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -614,6 +614,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
614 | protected InventoryItemBase CreateItemForObject( | 614 | protected InventoryItemBase CreateItemForObject( |
615 | DeRezAction action, IClientAPI remoteClient, SceneObjectGroup so, UUID folderID) | 615 | DeRezAction action, IClientAPI remoteClient, SceneObjectGroup so, UUID folderID) |
616 | { | 616 | { |
617 | // m_log.DebugFormat( | ||
618 | // "[BASIC INVENTORY ACCESS MODULE]: Creating item for object {0} {1} for folder {2}, action {3}", | ||
619 | // so.Name, so.UUID, folderID, action); | ||
620 | // | ||
617 | // Get the user info of the item destination | 621 | // Get the user info of the item destination |
618 | // | 622 | // |
619 | UUID userID = UUID.Zero; | 623 | UUID userID = UUID.Zero; |