aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-10-03 08:46:25 -0700
committerDiva Canto2009-10-03 08:46:25 -0700
commitde94aa9bb57db7602f4b1ded5f64765bbbd63eb5 (patch)
tree14337570dfb0213918bdc4e0a99efa9a0246815e
parentMOre streams closed. Corrected word in GridCommon.ini.example (diff)
parentFix my build break (diff)
downloadopensim-SC_OLD-de94aa9bb57db7602f4b1ded5f64765bbbd63eb5.zip
opensim-SC_OLD-de94aa9bb57db7602f4b1ded5f64765bbbd63eb5.tar.gz
opensim-SC_OLD-de94aa9bb57db7602f4b1ded5f64765bbbd63eb5.tar.bz2
opensim-SC_OLD-de94aa9bb57db7602f4b1ded5f64765bbbd63eb5.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 89d74b5..9622555 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -576,8 +576,8 @@ 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) 579 if ((objectOwnerMask & (uint)PermissionMask.Transfer) != 0 && task.ObjectSaleType != 0)
580 objectEveryoneMask |= ObjectFlags.ObjectTransfer; 580 objectEveryoneMask |= (uint)PrimFlags.ObjectTransfer;
581 581
582 // Group permissions 582 // Group permissions
583 if ((task.GroupID != UUID.Zero) && IsGroupMember(task.GroupID, user, 0)) 583 if ((task.GroupID != UUID.Zero) && IsGroupMember(task.GroupID, user, 0))