Apply patch to stop failure of llParcelMediaCommandList() on group deeded land
See http://opensimulator.org/mantis/view.php?id=3999mysql-performance
parent
32ef1b9e23
commit
25e2b16451
|
@ -800,30 +800,31 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
|||
}
|
||||
|
||||
protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers)
|
||||
{
|
||||
bool permission = false;
|
||||
|
||||
{
|
||||
if (parcel.LandData.OwnerID == user)
|
||||
{
|
||||
permission = true;
|
||||
// Returning immediately so that group deeded objects on group deeded land don't trigger a NRE on
|
||||
// the subsequent redundant checks when using lParcelMediaCommandList()
|
||||
// See http://opensimulator.org/mantis/view.php?id=3999 for more details
|
||||
return true;
|
||||
}
|
||||
|
||||
if (parcel.LandData.IsGroupOwned && IsGroupMember(parcel.LandData.GroupID, user, groupPowers))
|
||||
{
|
||||
permission = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (IsEstateManager(user))
|
||||
{
|
||||
permission = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (IsAdministrator(user))
|
||||
{
|
||||
permission = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
return permission;
|
||||
return false;
|
||||
}
|
||||
|
||||
protected bool GenericParcelPermission(UUID user, Vector3 pos, ulong groupPowers)
|
||||
|
|
Loading…
Reference in New Issue