ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

reverting #7295, as it still fails a test case (as pointed out very

Browse Source 
kindly by sean) --- lesson learned: just running a "make test" is not
sufficient, you need to precede it by a "make clean".
This commit is contained in:
Dr Scofield
2008-11-14 13:03:18 +00:00
parent 5e20e32b69
commit 5c21ec6d10
7 changed files with 23 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
View File

@@ -151,42 +151,23 @@ namespace OpenSim.Region.Environment.Scenes
taskItem.AssetID = item.AssetID;
taskItem.Name = item.Name;
taskItem.Description = item.Description;
taskItem.OwnerID = part.OwnerID; // Transfer ownership
taskItem.OwnerID = item.Owner;
taskItem.CreatorID = item.Creator;
taskItem.Type = item.AssetType;
taskItem.InvType = item.InvType;
if (remoteClient!=null && remoteClient.AgentId!=part.OwnerID &&
m_scene.ExternalChecks.ExternalChecksPropagatePermissions()) {
taskItem.BasePermissions = item.BasePermissions & item.NextPermissions;
taskItem.CurrentPermissions = item.CurrentPermissions & item.NextPermissions;
taskItem.EveryonePermissions = item.EveryOnePermissions & item.NextPermissions;
taskItem.NextPermissions = item.NextPermissions;
taskItem.CurrentPermissions |= 8;
} else {
taskItem.BasePermissions = item.BasePermissions;
taskItem.CurrentPermissions = item.CurrentPermissions;
taskItem.CurrentPermissions |= 8;
taskItem.EveryonePermissions = item.EveryOnePermissions;
taskItem.NextPermissions = item.NextPermissions;
}
taskItem.BasePermissions = item.BasePermissions;
taskItem.CurrentPermissions = item.CurrentPermissions;
// FIXME: ignoring group permissions for now as they aren't stored in item
taskItem.EveryonePermissions = item.EveryOnePermissions;
taskItem.NextPermissions = item.NextPermissions;
taskItem.Flags = item.Flags;
// TODO: These are pending addition of those fields to TaskInventoryItem
// taskItem.SalePrice = item.SalePrice;
// taskItem.SaleType = item.SaleType;
taskItem.CreationDate = (uint)item.CreationDate;
bool addFromAllowedDrop = false;
if (remoteClient!=null)
{
addFromAllowedDrop = remoteClient.AgentId!=part.OwnerID &&
m_scene.ExternalChecks.ExternalChecksPropagatePermissions();
}
part.AddInventoryItem(taskItem, addFromAllowedDrop);
part.AddInventoryItem(taskItem);
return true;
}