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/Framework/Scenes/Scene.Inventory.cs | |
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 '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 6808017..2ce778d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -39,6 +39,7 @@ using OpenSim.Region.Framework; | |||
39 | using OpenSim.Framework.Client; | 39 | using OpenSim.Framework.Client; |
40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Framework.Scenes.Serialization; | 41 | using OpenSim.Region.Framework.Scenes.Serialization; |
42 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
42 | 43 | ||
43 | namespace OpenSim.Region.Framework.Scenes | 44 | namespace OpenSim.Region.Framework.Scenes |
44 | { | 45 | { |
@@ -892,7 +893,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
892 | { | 893 | { |
893 | CreateNewInventoryItem( | 894 | CreateNewInventoryItem( |
894 | remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, asset, invType, | 895 | remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, asset, invType, |
895 | (uint)PermissionMask.All, (uint)PermissionMask.All, 0, nextOwnerMask, 0, creationDate); | 896 | (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, 0, nextOwnerMask, 0, creationDate); |
896 | } | 897 | } |
897 | 898 | ||
898 | /// <summary> | 899 | /// <summary> |
@@ -1010,8 +1011,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1010 | CreateNewInventoryItem( | 1011 | CreateNewInventoryItem( |
1011 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, | 1012 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, |
1012 | name, description, 0, callbackID, asset, invType, | 1013 | name, description, 0, callbackID, asset, invType, |
1013 | (uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All, | 1014 | (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All, |
1014 | (uint)PermissionMask.All, (uint)PermissionMask.All, Util.UnixTimeSinceEpoch()); | 1015 | (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, Util.UnixTimeSinceEpoch()); |
1015 | } | 1016 | } |
1016 | else | 1017 | else |
1017 | { | 1018 | { |