diff options
| author | BlueWall | 2012-02-22 22:29:30 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-22 22:29:30 -0500 |
| commit | af377470e14d9de47e7a67778e1ebd602239e1b1 (patch) | |
| tree | 77efe266c00fcb67ee1cc8a84dc9be411582ecfa /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | V3 Support (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-af377470e14d9de47e7a67778e1ebd602239e1b1.zip opensim-SC-af377470e14d9de47e7a67778e1ebd602239e1b1.tar.gz opensim-SC-af377470e14d9de47e7a67778e1ebd602239e1b1.tar.bz2 opensim-SC-af377470e14d9de47e7a67778e1ebd602239e1b1.tar.xz | |
Merge branch 'master' into v3_support
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 6cc78b8..23f39a8 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1155,8 +1155,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1155 | return; | 1155 | return; |
| 1156 | } | 1156 | } |
| 1157 | 1157 | ||
| 1158 | TaskInventoryItem item = part.Inventory.GetInventoryItem(itemId); | 1158 | if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0) |
| 1159 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) | ||
| 1160 | { | 1159 | { |
| 1161 | // If the item to be moved is no copy, we need to be able to | 1160 | // If the item to be moved is no copy, we need to be able to |
| 1162 | // edit the prim. | 1161 | // edit the prim. |