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

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

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

6
OpenSim/Data/Tests/BasicRegionTest.cs
View File

@ -591,9 +591,7 @@ namespace OpenSim.Data.Tests
Assert.That(t.ItemID,Is.EqualTo(id)); Assert.That(t.ItemID,Is.EqualTo(id));
Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID)); Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID));
Assert.That(t.NextPermissions, Is.EqualTo(nextperm)); Assert.That(t.NextPermissions, Is.EqualTo(nextperm));
// Ownership changes when you drop an object into an object Assert.That(t.OwnerID,Is.EqualTo(owner));
// owned by someone else
Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID));
Assert.That(t.CurrentPermissions, Is.EqualTo(curperm)); Assert.That(t.CurrentPermissions, Is.EqualTo(curperm));
Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID)); Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID));
Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID)); Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID));
@ -850,4 +848,4 @@ namespace OpenSim.Data.Tests
// return f; // return f;
// } // }
} }
} }

2
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -277,7 +277,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
public bool PropagatePermissions() public bool PropagatePermissions()
{ {
return !m_bypassPermissions; return false;
} }
public bool BypassPermissions() public bool BypassPermissions()

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

@ -1179,8 +1179,7 @@ namespace OpenSim.Region.Environment.Scenes
destTaskItem.InvType = srcTaskItem.InvType; destTaskItem.InvType = srcTaskItem.InvType;
destTaskItem.Type = srcTaskItem.Type; destTaskItem.Type = srcTaskItem.Type;
destPart.AddInventoryItem(destTaskItem, part.OwnerID!=destPart.OwnerID destPart.AddInventoryItem(destTaskItem);
&& ExternalChecks.ExternalChecksPropagatePermissions());
if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0) if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
part.RemoveInventoryItem(itemId); part.RemoveInventoryItem(itemId);
@ -1250,16 +1249,11 @@ namespace OpenSim.Region.Environment.Scenes
if (part != null) if (part != null)
{ {
TaskInventoryItem currentItem = part.GetInventoryItem(itemID); if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId))
bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
& (uint)PrimFlags.AllowInventoryDrop) != 0;
// Explicity allow anyone to add to the inventory if the AllowInventoryDrop
// flag has been set. Don't however let them update an item unless
// they pass the external checks
if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)
&& (currentItem != null || !allowInventoryDrop ))
return; return;
TaskInventoryItem currentItem = part.GetInventoryItem(itemID);
if (currentItem == null) if (currentItem == null)
{ {
UUID copyID = UUID.Random(); UUID copyID = UUID.Random();
@ -1423,7 +1417,7 @@ namespace OpenSim.Region.Environment.Scenes
taskItem.PermsMask = 0; taskItem.PermsMask = 0;
taskItem.AssetID = asset.FullID; taskItem.AssetID = asset.FullID;
part.AddInventoryItem(taskItem, false); part.AddInventoryItem(taskItem);
part.GetProperties(remoteClient); part.GetProperties(remoteClient);
part.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); part.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0);
@ -1518,7 +1512,7 @@ namespace OpenSim.Region.Environment.Scenes
destTaskItem.InvType = srcTaskItem.InvType; destTaskItem.InvType = srcTaskItem.InvType;
destTaskItem.Type = srcTaskItem.Type; destTaskItem.Type = srcTaskItem.Type;
destPart.AddInventoryItemExclusive(destTaskItem, false); destPart.AddInventoryItemExclusive(destTaskItem);
if (running > 0) if (running > 0)
{ {

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

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

18
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@ -289,16 +289,16 @@ namespace OpenSim.Region.Environment.Scenes
/// name is chosen. /// name is chosen.
/// </summary> /// </summary>
/// <param name="item"></param> /// <param name="item"></param>
public void AddInventoryItem(TaskInventoryItem item, bool allowedDrop) public void AddInventoryItem(TaskInventoryItem item)
{ {
AddInventoryItem(item.Name, item, allowedDrop); AddInventoryItem(item.Name, item);
} }
/// <summary> /// <summary>
/// Add an item to this prim's inventory. If an item with the same name already exists, it is replaced. /// Add an item to this prim's inventory. If an item with the same name already exists, it is replaced.
/// </summary> /// </summary>
/// <param name="item"></param> /// <param name="item"></param>
public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop) public void AddInventoryItemExclusive(TaskInventoryItem item)
{ {
List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_taskInventory.Values); List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_taskInventory.Values);
foreach (TaskInventoryItem i in il) foreach (TaskInventoryItem i in il)
@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
AddInventoryItem(item.Name, item, allowedDrop); AddInventoryItem(item.Name, item);
} }
/// <summary> /// <summary>
@ -324,10 +324,7 @@ namespace OpenSim.Region.Environment.Scenes
/// The item itself. The name within this structure is ignored in favour of the name /// The item itself. The name within this structure is ignored in favour of the name
/// given in this method's arguments /// given in this method's arguments
/// </param> /// </param>
/// <param name="allowedDrop"> protected void AddInventoryItem(string name, TaskInventoryItem item)
// Item was only added to inventory because AllowedDrop is set
/// </param>
protected void AddInventoryItem(string name, TaskInventoryItem item, bool allowedDrop)
{ {
name = FindAvailableInventoryName(name); name = FindAvailableInventoryName(name);
if (name == String.Empty) if (name == String.Empty)
@ -340,10 +337,7 @@ namespace OpenSim.Region.Environment.Scenes
lock (m_taskInventory) lock (m_taskInventory)
{ {
m_taskInventory.Add(item.ItemID, item); m_taskInventory.Add(item.ItemID, item);
if (allowedDrop) TriggerScriptChangedEvent(Changed.INVENTORY);
TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
else
TriggerScriptChangedEvent(Changed.INVENTORY);
} }
m_inventorySerial++; m_inventorySerial++;

3
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -4006,9 +4006,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.ParentGroup.RootPart.AllowedDrop = true; m_host.ParentGroup.RootPart.AllowedDrop = true;
else else
m_host.ParentGroup.RootPart.AllowedDrop = false; m_host.ParentGroup.RootPart.AllowedDrop = false;
// Update the object flags
m_host.ParentGroup.RootPart.aggregateScriptEvents();
} }
public LSL_Vector llGetSunDirection() public LSL_Vector llGetSunDirection()

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1014,7 +1014,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
taskItem.PermsMask = 0; taskItem.PermsMask = 0;
taskItem.AssetID = asset.FullID; taskItem.AssetID = asset.FullID;
m_host.AddInventoryItem(taskItem, false); m_host.AddInventoryItem(taskItem);
} }
} }
} }