diff options
| author | Melanie Thielker | 2014-04-26 20:32:27 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-04-26 20:32:27 +0200 |
| commit | d97896d39a50cdcbf1d96a9a9382b4dde7b76b53 (patch) | |
| tree | b0e7700519756379b280e1337b1c53f7e5e6cbd6 /OpenSim/Region/CoreModules/World/Permissions | |
| parent | Convert region loading to new format (diff) | |
| download | opensim-SC_OLD-d97896d39a50cdcbf1d96a9a9382b4dde7b76b53.zip opensim-SC_OLD-d97896d39a50cdcbf1d96a9a9382b4dde7b76b53.tar.gz opensim-SC_OLD-d97896d39a50cdcbf1d96a9a9382b4dde7b76b53.tar.bz2 opensim-SC_OLD-d97896d39a50cdcbf1d96a9a9382b4dde7b76b53.tar.xz | |
Differentiate between requests only the owner should be able to do and those
that managers can do when setting parcel data
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 26e9131..4f5b9b7 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -1047,7 +1047,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1047 | return GenericObjectPermission(editorID, objectID, false); | 1047 | return GenericObjectPermission(editorID, objectID, false); |
| 1048 | } | 1048 | } |
| 1049 | 1049 | ||
| 1050 | private bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers p, Scene scene) | 1050 | private bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers p, Scene scene, bool allowManager) |
| 1051 | { | 1051 | { |
| 1052 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1052 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
| 1053 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1053 | if (m_bypassPermissions) return m_bypassPermissionsValue; |