Merge branch 'master' into htb-throttle

This is hand-edited to not let master changes creep into here and may cause a
somewhat rocky merge to master later.

1 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 901144a..fe9de1b 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -556,6 +556,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             // Customize the EveryoneMask
             uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags);
+            if (objectOwner != UUID.Zero)
+                objectEveryoneMask |= (uint)PrimFlags.ObjectAnyOwner;
 
             if (m_bypassPermissions)
                 return objectOwnerMask;
@@ -578,12 +580,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             {
                 // Admin objects should not be editable by the above
                 if (!IsAdministrator(objectOwner))
-            return objectOwnerMask;
+                    return objectOwnerMask;
             }
 
-            if ((objectOwnerMask & (uint)PermissionMask.Transfer) != 0 && task.ObjectSaleType != 0)
-                objectEveryoneMask |= (uint)PrimFlags.ObjectTransfer;
-
             // Group permissions
             if ((task.GroupID != UUID.Zero) && IsGroupMember(task.GroupID, user, 0))
                 return objectGroupMask | objectEveryoneMask;