diff options
author | Justin Clark-Casey (justincc) | 2012-02-21 22:54:30 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-21 22:54:30 +0000 |
commit | 5397a6d4c626818af9aed1e2e0dedd430fb4b948 (patch) | |
tree | 42b1cb15aa18d8db51b0334c6911fdbfc869ddaf /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Revert "Fix:Cannot drag inventory from child prim into inventory http://opens... (diff) | |
download | opensim-SC_OLD-5397a6d4c626818af9aed1e2e0dedd430fb4b948.zip opensim-SC_OLD-5397a6d4c626818af9aed1e2e0dedd430fb4b948.tar.gz opensim-SC_OLD-5397a6d4c626818af9aed1e2e0dedd430fb4b948.tar.bz2 opensim-SC_OLD-5397a6d4c626818af9aed1e2e0dedd430fb4b948.tar.xz |
Fix problem with dragging child part inventory item to user inventory.
This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller.
Resolves http://opensimulator.org/mantis/view.php?id=5569
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 6cc78b8..83e3a45 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1146,17 +1146,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1146 | 1146 | ||
1147 | TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId); | 1147 | TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId); |
1148 | 1148 | ||
1149 | if (null == taskItem) | 1149 | if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0) |
1150 | { | ||
1151 | m_log.WarnFormat("[PRIM INVENTORY]: Move of inventory item {0} from prim with local id {1} failed" | ||
1152 | + " because the inventory item could not be found", | ||
1153 | itemId, primLocalId); | ||
1154 | |||
1155 | return; | ||
1156 | } | ||
1157 | |||
1158 | TaskInventoryItem item = part.Inventory.GetInventoryItem(itemId); | ||
1159 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) | ||
1160 | { | 1150 | { |
1161 | // If the item to be moved is no copy, we need to be able to | 1151 | // If the item to be moved is no copy, we need to be able to |
1162 | // edit the prim. | 1152 | // edit the prim. |