OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569" 

This reverts commit 15ce73caca.

As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way.
xassetservice
Justin Clark-Casey (justincc) 2012-02-21 22:49:06 +00:00
parent 15ce73caca
commit 76f411147d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1144,11 +1144,6 @@ namespace OpenSim.Region.Framework.Scenes
return;
}
UUID partUUID = part.UUID;
SceneObjectGroup group = part.ParentGroup;
if (group != null)
partUUID = group.RootPart.UUID;
TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId);
if (null == taskItem)
@ -1160,18 +1155,19 @@ namespace OpenSim.Region.Framework.Scenes
return;
}
if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
TaskInventoryItem item = part.Inventory.GetInventoryItem(itemId);
if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
{
// If the item to be moved is no copy, we need to be able to
// edit the prim.
if (!Permissions.CanEditObjectInventory(partUUID, remoteClient.AgentId))
if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId))
return;
}
else
{
// If the item is copiable, then we just need to have perms
// on it. The delete check is a pure rights check
if (!Permissions.CanDeleteObject(partUUID, remoteClient.AgentId))
if (!Permissions.CanDeleteObject(part.UUID, remoteClient.AgentId))
return;
}