diff options
author | UbitUmarov | 2014-11-08 02:02:45 +0000 |
---|---|---|
committer | UbitUmarov | 2014-11-08 02:02:45 +0000 |
commit | c5dcc0d8c147040b4913a7f9d3f5aff9fd065b8d (patch) | |
tree | a217568a744dc22ebd50cdd99bc0e17932305e27 /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
parent | remove duplicated lines (diff) | |
download | opensim-SC_OLD-c5dcc0d8c147040b4913a7f9d3f5aff9fd065b8d.zip opensim-SC_OLD-c5dcc0d8c147040b4913a7f9d3f5aff9fd065b8d.tar.gz opensim-SC_OLD-c5dcc0d8c147040b4913a7f9d3f5aff9fd065b8d.tar.bz2 opensim-SC_OLD-c5dcc0d8c147040b4913a7f9d3f5aff9fd065b8d.tar.xz |
try to preserve permitions on object returns
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 64a9610..15718d2 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 | |||
512 | item.Name = asset.Name; | 512 | item.Name = asset.Name; |
513 | item.AssetType = asset.Type; | 513 | item.AssetType = asset.Type; |
514 | 514 | ||
515 | AddPermissions(item, objlist[0], objlist, remoteClient); | 515 | //preserve perms on return |
516 | if(DeRezAction.Return == action) | ||
517 | AddPermissions(item, objlist[0], objlist, null); | ||
518 | else | ||
519 | AddPermissions(item, objlist[0], objlist, remoteClient); | ||
516 | 520 | ||
517 | m_Scene.AddInventoryItem(item); | 521 | m_Scene.AddInventoryItem(item); |
518 | 522 | ||