aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a29b7f1..06f8ac1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1733,7 +1733,12 @@ namespace OpenSim.Region.Framework.Scenes
1733 // Autoreturn has a null client. Nothing else does. So 1733 // Autoreturn has a null client. Nothing else does. So
1734 // allow only returns 1734 // allow only returns
1735 if (action != DeRezAction.Return) 1735 if (action != DeRezAction.Return)
1736 {
1737 m_log.WarnFormat(
1738 "[AGENT INVENTORY]: Ignoring attempt to {0} {1} {2} without a client",
1739 action, grp.Name, grp.UUID);
1736 return; 1740 return;
1741 }
1737 1742
1738 permissionToTakeCopy = false; 1743 permissionToTakeCopy = false;
1739 } 1744 }
@@ -1741,13 +1746,13 @@ namespace OpenSim.Region.Framework.Scenes
1741 { 1746 {
1742 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId)) 1747 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
1743 permissionToTakeCopy = false; 1748 permissionToTakeCopy = false;
1749
1744 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId)) 1750 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
1745 permissionToTake = false; 1751 permissionToTake = false;
1746 1752
1747 if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId)) 1753 if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
1748 permissionToDelete = false; 1754 permissionToDelete = false;
1749 } 1755 }
1750
1751 } 1756 }
1752 1757
1753 // Handle god perms 1758 // Handle god perms