From c5dcc0d8c147040b4913a7f9d3f5aff9fd065b8d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 8 Nov 2014 02:02:45 +0000 Subject: [PATCH] try to preserve permitions on object returns --- .../Framework/InventoryAccess/InventoryAccessModule.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 64a9610e1c..15718d27e3 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs @@ -512,7 +512,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess item.Name = asset.Name; item.AssetType = asset.Type; - AddPermissions(item, objlist[0], objlist, remoteClient); + //preserve perms on return + if(DeRezAction.Return == action) + AddPermissions(item, objlist[0], objlist, null); + else + AddPermissions(item, objlist[0], objlist, remoteClient); m_Scene.AddInventoryItem(item);