diff options
Merge branch 'master' into presence-refactor
Diffstat (limited to '')
-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 91c0a53..ae3dc2e 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -817,7 +817,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
817 | } | 817 | } |
818 | 818 | ||
819 | protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers) | 819 | protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers) |
820 | { | 820 | { |
821 | if (parcel.LandData.OwnerID == user) | 821 | if (parcel.LandData.OwnerID == user) |
822 | { | 822 | { |
823 | // Returning immediately so that group deeded objects on group deeded land don't trigger a NRE on | 823 | // Returning immediately so that group deeded objects on group deeded land don't trigger a NRE on |