diff options
author | Oren Hurvitz | 2014-04-16 13:29:56 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-20 06:23:36 +0100 |
commit | 090f9bcece2d8688c8d9c0db3ca50ff387c1a107 (patch) | |
tree | 268d7198933d63120b9b92ea25c9e75c39524c43 /OpenSim/Region/CoreModules | |
parent | Fixed: if a user belonged to the parcel's group then he was allowed to rez ob... (diff) | |
download | opensim-SC_OLD-090f9bcece2d8688c8d9c0db3ca50ff387c1a107.zip opensim-SC_OLD-090f9bcece2d8688c8d9c0db3ca50ff387c1a107.tar.gz opensim-SC_OLD-090f9bcece2d8688c8d9c0db3ca50ff387c1a107.tar.bz2 opensim-SC_OLD-090f9bcece2d8688c8d9c0db3ca50ff387c1a107.tar.xz |
Fixed: once a user has rezzed an object, they could then duplicate it as much as they wanted even if the parcel's permissions had since been changed to disallow rezzing
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index e961922..39f5a4a 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -1009,9 +1009,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
1009 | return false; | 1009 | return false; |
1010 | 1010 | ||
1011 | if (part.OwnerID == owner) | 1011 | if (part.OwnerID == owner) |
1012 | return ((part.OwnerMask & PERM_COPY) != 0); | 1012 | { |
1013 | 1013 | if ((part.OwnerMask & PERM_COPY) == 0) | |
1014 | if (part.GroupID != UUID.Zero) | 1014 | return false; |
1015 | } | ||
1016 | else if (part.GroupID != UUID.Zero) | ||
1015 | { | 1017 | { |
1016 | if ((part.OwnerID == part.GroupID) && ((owner != part.LastOwnerID) || ((part.GroupMask & PERM_TRANS) == 0))) | 1018 | if ((part.OwnerID == part.GroupID) && ((owner != part.LastOwnerID) || ((part.GroupMask & PERM_TRANS) == 0))) |
1017 | return false; | 1019 | return false; |