ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Create CanEditObjectInventory to preserve the ability

Browse Source 
to have different permissions on inventory and object
edits. This may be needed by the viewer on public grids
This commit is contained in:
Melanie Thielker
2008-09-22 12:52:56 +00:00
parent 7def786ef4
commit d7a98925ce
3 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1186,18 +1186,7 @@ namespace OpenSim.Region.Environment.Scenes
if (part != null)
{
// replacing the following two checks with the
// ExternalChecks.ExternalChecksCanEditObject(...)
// call
// if (part.OwnerID != remoteClient.AgentId)
// return;
// if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
// return;
if (!ExternalChecks.ExternalChecksCanEditObject(part.UUID, remoteClient.AgentId))
if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId))
{
return;
}
@@ -1293,20 +1282,7 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T
SceneObjectPart part = GetSceneObjectPart(localID);
if (part != null)
{
/*
if (part.OwnerID != remoteClient.AgentId)
{
return;
}
if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
{
return;
}
*/
if (!ExternalChecks.ExternalChecksCanEditObject(part.UUID, remoteClient.AgentId))
if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId))
{
return;
}

27
OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
View File

@@ -343,6 +343,33 @@ namespace OpenSim.Region.Environment.Scenes
return true;
}
public delegate bool CanEditObjectInventory(UUID objectID, UUID editorID, Scene scene);
private List<CanEditObjectInventory> CanEditObjectInventoryCheckFunctions = new List<CanEditObjectInventory>();
public void addCheckEditObjectInventory(CanEditObjectInventory delegateFunc)
{
if (!CanEditObjectInventoryCheckFunctions.Contains(delegateFunc))
CanEditObjectInventoryCheckFunctions.Add(delegateFunc);
}
public void removeCheckEditObjectInventory(CanEditObjectInventory delegateFunc)
{
if (CanEditObjectInventoryCheckFunctions.Contains(delegateFunc))
CanEditObjectInventoryCheckFunctions.Remove(delegateFunc);
}
public bool ExternalChecksCanEditObjectInventory(UUID objectID, UUID editorID)
{
foreach (CanEditObjectInventory check in CanEditObjectInventoryCheckFunctions)
{
if (check(objectID, editorID, m_scene) == false)
{
return false;
}
}
return true;
}
#endregion
#region MOVE OBJECT