aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-05-03 16:03:26 +0100
committerUbitUmarov2017-05-03 16:03:26 +0100
commit94bb6d965e8c6e185b378546e2b84b1db8cadd80 (patch)
tree12292794e1e072730f050e6e05ab9f130c0eb6aa /OpenSim/Region/Framework
parentMerge branch 'master' of opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-94bb6d965e8c6e185b378546e2b84b1db8cadd80.zip
opensim-SC_OLD-94bb6d965e8c6e185b378546e2b84b1db8cadd80.tar.gz
opensim-SC_OLD-94bb6d965e8c6e185b378546e2b84b1db8cadd80.tar.bz2
opensim-SC_OLD-94bb6d965e8c6e185b378546e2b84b1db8cadd80.tar.xz
change taskInventory copy/move to agents inventory rules
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index afdd99e..ca1e0a8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1388,11 +1388,7 @@ namespace OpenSim.Region.Framework.Scenes
1388 } 1388 }
1389 1389
1390 if (!Permissions.CanCopyObjectInventory(itemId, part.UUID, remoteClient.AgentId)) 1390 if (!Permissions.CanCopyObjectInventory(itemId, part.UUID, remoteClient.AgentId))
1391 { 1391 return;
1392 // check also if we can delete the no copy item
1393 if(!Permissions.CanEditObject(part.UUID, remoteClient.AgentId))
1394 return;
1395 }
1396 1392
1397 string message; 1393 string message;
1398 InventoryItemBase item = MoveTaskInventoryItem(remoteClient, folderId, part, itemId, out message); 1394 InventoryItemBase item = MoveTaskInventoryItem(remoteClient, folderId, part, itemId, out message);
@@ -1769,7 +1765,6 @@ namespace OpenSim.Region.Framework.Scenes
1769 itemInfo.CurrentPermissions &= currentItem.BasePermissions; 1765 itemInfo.CurrentPermissions &= currentItem.BasePermissions;
1770 itemInfo.NextPermissions &= currentItem.BasePermissions; 1766 itemInfo.NextPermissions &= currentItem.BasePermissions;
1771 } 1767 }
1772
1773 } 1768 }
1774 else 1769 else
1775 { 1770 {