aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2010-07-01 16:11:10 +0200
committerMelanie Thielker2010-07-01 16:11:10 +0200
commit3940a4dbc7ffb4eab319ea9c2f1f787ddeee65e8 (patch)
tree7b3e8d4118215268ac5d71b39e8deca1b409de1d /OpenSim/Region/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-3940a4dbc7ffb4eab319ea9c2f1f787ddeee65e8.zip
opensim-SC-3940a4dbc7ffb4eab319ea9c2f1f787ddeee65e8.tar.gz
opensim-SC-3940a4dbc7ffb4eab319ea9c2f1f787ddeee65e8.tar.bz2
opensim-SC-3940a4dbc7ffb4eab319ea9c2f1f787ddeee65e8.tar.xz
Avoid a spurious error message when taking a friend's no copy item
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 0ac427f..167e166 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1604,8 +1604,15 @@ namespace OpenSim.Region.Framework.Scenes
1604 } 1604 }
1605 else 1605 else
1606 { 1606 {
1607 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId)) 1607 if (action == DeRezAction.TakeCopy)
1608 {
1609 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
1610 permissionToTakeCopy = false;
1611 }
1612 else
1613 {
1608 permissionToTakeCopy = false; 1614 permissionToTakeCopy = false;
1615 }
1609 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId)) 1616 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
1610 permissionToTake = false; 1617 permissionToTake = false;
1611 1618