diff options
author | Melanie Thielker | 2009-06-24 23:45:21 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-06-24 23:45:21 +0000 |
commit | 9d07584ea1bb73ba87f10486a6c2e695983395ef (patch) | |
tree | 9ed81e0734886f876348db315182a31e6b2f018a /OpenSim/Region/CoreModules/World/Permissions | |
parent | Reading GroupPosition, but setting OffsetPosition in undo doesnt' seem right. (diff) | |
download | opensim-SC_OLD-9d07584ea1bb73ba87f10486a6c2e695983395ef.zip opensim-SC_OLD-9d07584ea1bb73ba87f10486a6c2e695983395ef.tar.gz opensim-SC_OLD-9d07584ea1bb73ba87f10486a6c2e695983395ef.tar.bz2 opensim-SC_OLD-9d07584ea1bb73ba87f10486a6c2e695983395ef.tar.xz |
Allow "Take Copy" with copy only permissions if you own the object. Trans
is only required when taing an object you don't own, now.
Fixes Mantis #3838
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 92d9e6c..99035b6 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -1309,8 +1309,16 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
1309 | if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) | 1309 | if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) |
1310 | permission = true; | 1310 | permission = true; |
1311 | 1311 | ||
1312 | if ((task.GetEffectivePermissions() & (PERM_COPY | PERM_TRANS)) != (PERM_COPY | PERM_TRANS)) | 1312 | if (task.OwnerID != userID) |
1313 | permission = false; | 1313 | { |
1314 | if ((task.GetEffectivePermissions() & (PERM_COPY | PERM_TRANS)) != (PERM_COPY | PERM_TRANS)) | ||
1315 | permission = false; | ||
1316 | } | ||
1317 | else | ||
1318 | { | ||
1319 | if ((task.GetEffectivePermissions() & PERM_COPY) != PERM_COPY) | ||
1320 | permission = false; | ||
1321 | } | ||
1314 | } | 1322 | } |
1315 | else | 1323 | else |
1316 | { | 1324 | { |