diff options
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 59b9585..8241e07 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -990,13 +990,20 @@ namespace OpenSim.Region.ClientStack.Linden | |||
990 | else | 990 | else |
991 | prim.Name = assetName + "#" + i.ToString(); | 991 | prim.Name = assetName + "#" + i.ToString(); |
992 | 992 | ||
993 | prim.EveryoneMask = 0; | ||
994 | prim.GroupMask = 0; | ||
995 | |||
993 | if (restrictPerms) | 996 | if (restrictPerms) |
994 | { | 997 | { |
995 | prim.BaseMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | 998 | prim.BaseMask = (uint)(PermissionMask.Move | PermissionMask.Modify); |
996 | prim.EveryoneMask = 0; | ||
997 | prim.GroupMask = 0; | ||
998 | prim.NextOwnerMask = 0; | ||
999 | prim.OwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | 999 | prim.OwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify); |
1000 | prim.NextOwnerMask = 0; | ||
1001 | } | ||
1002 | else | ||
1003 | { | ||
1004 | prim.BaseMask = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1005 | prim.OwnerMask = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1006 | prim.NextOwnerMask = (uint)PermissionMask.Transfer; | ||
1000 | } | 1007 | } |
1001 | 1008 | ||
1002 | if(istest) | 1009 | if(istest) |
@@ -1099,21 +1106,17 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1099 | 1106 | ||
1100 | if (restrictPerms) | 1107 | if (restrictPerms) |
1101 | { | 1108 | { |
1102 | item.CurrentPermissions | ||
1103 | = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
1104 | |||
1105 | item.BasePermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); | 1109 | item.BasePermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); |
1110 | item.CurrentPermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
1106 | item.EveryOnePermissions = 0; | 1111 | item.EveryOnePermissions = 0; |
1107 | item.NextPermissions = 0; | 1112 | item.NextPermissions = 0; |
1108 | } | 1113 | } |
1109 | else | 1114 | else |
1110 | { | 1115 | { |
1111 | item.CurrentPermissions | ||
1112 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export); | ||
1113 | |||
1114 | item.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | 1116 | item.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; |
1117 | item.CurrentPermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1115 | item.EveryOnePermissions = 0; | 1118 | item.EveryOnePermissions = 0; |
1116 | item.NextPermissions = (uint)PermissionMask.All; | 1119 | item.NextPermissions = (uint)PermissionMask.Transfer; |
1117 | } | 1120 | } |
1118 | 1121 | ||
1119 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 1122 | item.CreationDate = Util.UnixTimeSinceEpoch(); |