aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-10-03 14:22:29 +0100
committerMelanie2009-10-03 14:22:29 +0100
commitb4d1cf0009777fa95760419c955eb20e1027badf (patch)
tree3825942c9c036c3489b1de5afb4ee2e51fcf7290
parentMerge branch 'diva-textures-osgrid' (diff)
downloadopensim-SC_OLD-b4d1cf0009777fa95760419c955eb20e1027badf.zip
opensim-SC_OLD-b4d1cf0009777fa95760419c955eb20e1027badf.tar.gz
opensim-SC_OLD-b4d1cf0009777fa95760419c955eb20e1027badf.tar.bz2
opensim-SC_OLD-b4d1cf0009777fa95760419c955eb20e1027badf.tar.xz
Small permissions tweak
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 040d0a3..89d74b5 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -576,9 +576,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
576 return objectOwnerMask; 576 return objectOwnerMask;
577 } 577 }
578 578
579 if ((objectOwnerMask & PermissionMask.Transfer != 0) && task.saleType != 0)
580 objectEveryoneMask |= ObjectFlags.ObjectTransfer;
581
579 // Group permissions 582 // Group permissions
580 if ((task.GroupID != UUID.Zero) && IsGroupMember(task.GroupID, user, 0)) 583 if ((task.GroupID != UUID.Zero) && IsGroupMember(task.GroupID, user, 0))
581 return objectGroupMask; 584 return objectGroupMask | objectEveryoneMask;
582 585
583 return objectEveryoneMask; 586 return objectEveryoneMask;
584 } 587 }