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

Adjust permissions to work hand in hand with what the viewer believes they are. 

This fixes the issue of "Show in Search" seeming resetting at random.
0.8.0.3
Melanie 2014-04-25 00:34:44 +01:00
parent cf54df3ecf
commit 2572ed9ed9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@ -901,7 +901,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return permission; return permission;
} }
protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers) protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers, bool allowEstateManager)
{ {
if (parcel.LandData.OwnerID == user) if (parcel.LandData.OwnerID == user)
{ {
@ -916,7 +916,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return true; return true;
} }
if (IsEstateManager(user)) if (allowEstateManager && IsEstateManager(user))
{ {
return true; return true;
} }
@ -943,7 +943,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandRelease); return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandRelease, false);
} }
private bool CanReclaimParcel(UUID user, ILandObject parcel, Scene scene) private bool CanReclaimParcel(UUID user, ILandObject parcel, Scene scene)
@ -951,7 +951,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
return GenericParcelOwnerPermission(user, parcel, 0); return GenericParcelOwnerPermission(user, parcel, 0,true);
} }
private bool CanDeedParcel(UUID user, ILandObject parcel, Scene scene) private bool CanDeedParcel(UUID user, ILandObject parcel, Scene scene)
@ -968,7 +968,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if ((client.GetGroupPowers(parcel.LandData.GroupID) & (ulong)GroupPowers.LandDeed) == 0) if ((client.GetGroupPowers(parcel.LandData.GroupID) & (ulong)GroupPowers.LandDeed) == 0)
return false; return false;
return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandDeed); return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandDeed, false);
} }
private bool CanDeedObject(UUID user, UUID group, Scene scene) private bool CanDeedObject(UUID user, UUID group, Scene scene)
@ -1055,7 +1055,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
return GenericParcelOwnerPermission(user, parcel, (ulong)p); return GenericParcelOwnerPermission(user, parcel, (ulong)p, false);
} }
/// <summary> /// <summary>
@ -1501,7 +1501,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandSetSale); return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandSetSale, false);
} }
private bool CanTakeObject(UUID objectID, UUID stealer, Scene scene) private bool CanTakeObject(UUID objectID, UUID stealer, Scene scene)