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

Allow modifying a no mod object through llGiveInventoryItem if the object 

sets allowed drop. This makes breedables feasible.
avinationmerge
Melanie 2011-02-21 04:14:49 +01:00
parent efd8d03c59
commit 1a31f7b579
1 changed files with 5 additions and 1 deletions
OpenSim/Region/Framework/Scenes

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

@ -1227,6 +1227,10 @@ namespace OpenSim.Region.Framework.Scenes
if ((part.OwnerID != destPart.OwnerID) && ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)) if ((part.OwnerID != destPart.OwnerID) && ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0))
return; return;
bool overrideNoMod = false;
if ((part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0)
overrideNoMod = true;
if (part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0) if (part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
{ {
// object cannot copy items to an object owned by a different owner // object cannot copy items to an object owned by a different owner
@ -1236,7 +1240,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
// must have both move and modify permission to put an item in an object // must have both move and modify permission to put an item in an object
if ((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0) if (((part.OwnerMask & (uint)PermissionMask.Modify) == 0) && (!overrideNoMod))
{ {
return; return;
} }