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

Mantis#1603. Thank you, Matth for a patch to llGiveInventory 

and Melanie for helping to finish it.
0.6.0-stable
Charles Krinke 2008-06-26 20:52:05 +00:00
parent f8ccf00f1c
commit 751150100b
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1009,6 +1009,21 @@ namespace OpenSim.Region.Environment.Scenes
return; return;
} }
// todo: also check llAllowInventoryDrop when implemented
if(part.OwnerID != destPart.OwnerID)
{
// object cannot copy items to an object owned by a different owner
// unless llAllowInventoryDrop has been called
return;
}
// must have both move and modify permission to put an item in an object
if((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0 )
{
return;
}
TaskInventoryItem destTaskItem = new TaskInventoryItem(); TaskInventoryItem destTaskItem = new TaskInventoryItem();
destTaskItem.ItemID = LLUUID.Random(); destTaskItem.ItemID = LLUUID.Random();
@ -1051,7 +1066,13 @@ namespace OpenSim.Region.Environment.Scenes
if ((srcTaskItem.OwnerMask & (uint)PermissionMask.Copy) == 0) if ((srcTaskItem.OwnerMask & (uint)PermissionMask.Copy) == 0)
part.RemoveInventoryItem(itemId); part.RemoveInventoryItem(itemId);
ScenePresence avatar;
if(TryGetAvatar(srcTaskItem.OwnerID, out avatar))
{
destPart.GetProperties(avatar.ControllingClient);
}
} }
public void MoveTaskInventoryItems(LLUUID destID, string category, SceneObjectPart host, List<LLUUID> items) public void MoveTaskInventoryItems(LLUUID destID, string category, SceneObjectPart host, List<LLUUID> items)