diff options
author | Melanie | 2013-03-26 03:40:06 +0000 |
---|---|---|
committer | Melanie | 2013-03-26 03:40:06 +0000 |
commit | 5f4c4df227025c6b6156ce8238b56553dca4b5ae (patch) | |
tree | b090b809346ba8e39db1e08ca24933e64dae8ab9 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
parent | BulletSim: new algorithm for vertical attraction which uses quaternion (diff) | |
download | opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.zip opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.gz opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.bz2 opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.xz |
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 20df8a6..8752404 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -49,6 +49,7 @@ using OpenSim.Services.Interfaces; | |||
49 | using Caps = OpenSim.Framework.Capabilities.Caps; | 49 | using Caps = OpenSim.Framework.Capabilities.Caps; |
50 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | 50 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; |
51 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | 51 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; |
52 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
52 | 53 | ||
53 | namespace OpenSim.Region.ClientStack.Linden | 54 | namespace OpenSim.Region.ClientStack.Linden |
54 | { | 55 | { |
@@ -705,9 +706,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
705 | // If we set PermissionMask.All then when we rez the item the next permissions will replace the current | 706 | // If we set PermissionMask.All then when we rez the item the next permissions will replace the current |
706 | // (owner) permissions. This becomes a problem if next permissions are changed. | 707 | // (owner) permissions. This becomes a problem if next permissions are changed. |
707 | item.CurrentPermissions | 708 | item.CurrentPermissions |
708 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); | 709 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export); |
709 | 710 | ||
710 | item.BasePermissions = (uint)PermissionMask.All; | 711 | item.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; |
711 | item.EveryOnePermissions = 0; | 712 | item.EveryOnePermissions = 0; |
712 | item.NextPermissions = (uint)PermissionMask.All; | 713 | item.NextPermissions = (uint)PermissionMask.All; |
713 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 714 | item.CreationDate = Util.UnixTimeSinceEpoch(); |