aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-01-25 20:26:09 +0000
committerUbitUmarov2017-01-25 20:26:09 +0000
commitdd190f1a1f4639b580cab1cd0695e4ee9534e8ed (patch)
tree173da261f4db0e04e4a370543fe03f9bac1ec7ea /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parent add and use CanDropInObjectInv (diff)
downloadopensim-SC-dd190f1a1f4639b580cab1cd0695e4ee9534e8ed.zip
opensim-SC-dd190f1a1f4639b580cab1cd0695e4ee9534e8ed.tar.gz
opensim-SC-dd190f1a1f4639b580cab1cd0695e4ee9534e8ed.tar.bz2
opensim-SC-dd190f1a1f4639b580cab1cd0695e4ee9534e8ed.tar.xz
CHANGED ALLOWED_DROP should only trigger if user has no MOD rights
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 7377e6d..dbc7def 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1648,7 +1648,7 @@ namespace OpenSim.Region.Framework.Scenes
1648 if (itemID == UUID.Zero) 1648 if (itemID == UUID.Zero)
1649 { 1649 {
1650 m_log.ErrorFormat( 1650 m_log.ErrorFormat(
1651 "[PRIM INVENTORY]: UpdateTaskInventory called with item ID Zero to update for {1}!", 1651 "[PRIM INVENTORY]: UpdateTaskInventory called with item ID Zero on update for {1}!",
1652 remoteClient.Name); 1652 remoteClient.Name);
1653 return; 1653 return;
1654 } 1654 }
@@ -1686,7 +1686,8 @@ namespace OpenSim.Region.Framework.Scenes
1686 return; 1686 return;
1687 1687
1688 UUID copyID = UUID.Random(); 1688 UUID copyID = UUID.Random();
1689 part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID); 1689 bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient);
1690 part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights);
1690 m_log.InfoFormat( 1691 m_log.InfoFormat(
1691 "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", 1692 "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
1692 item.Name, primLocalID, remoteClient.Name); 1693 item.Name, primLocalID, remoteClient.Name);