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

Revert r6697 patch as the build fails.

Browse Source
This commit is contained in:
Charles Krinke
2008-10-06 00:58:43 +00:00
parent dedc1baeb7
commit e575ef7ad2
19 changed files with 118 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -984,9 +984,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
bool permission = false;
// Estate override
if (GenericEstatePermission(user))
return true;
permission = true;
float X = position.X;
float Y = position.Y;
@@ -1000,19 +1002,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
if (Y < 0)
Y = 0;
ILandObject parcel = m_scene.LandChannel.GetLandObject(X, Y);
if (parcel == null)
return false;
// Others allowed to terraform?
if ((parcel.landData.Flags & ((int)Parcel.ParcelFlags.AllowTerraform)) != 0)
return true;
// Land owner can terraform too
ILandObject parcel = m_scene.LandChannel.GetLandObject(X, Y);
if (parcel != null && GenericParcelPermission(user, parcel))
return true;
permission = true;
return false;
return permission;
}
private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene)