diff options
author | Melanie | 2013-03-24 18:56:28 +0100 |
---|---|---|
committer | Melanie | 2013-03-24 18:56:28 +0100 |
commit | c341664c1b8ccf3bd7b81795b900b971a15ff318 (patch) | |
tree | 7d88b1b0f028e798f49c729c1626d06f96d2ba35 /OpenSim/Framework/Util.cs | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
download | opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.zip opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.tar.gz opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.tar.bz2 opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.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/Framework/Util.cs')
-rw-r--r-- | OpenSim/Framework/Util.cs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index e4d7e19..557f38e 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -54,6 +54,21 @@ using Amib.Threading; | |||
54 | 54 | ||
55 | namespace OpenSim.Framework | 55 | namespace OpenSim.Framework |
56 | { | 56 | { |
57 | [Flags] | ||
58 | public enum PermissionMask : uint | ||
59 | { | ||
60 | None = 0, | ||
61 | Transfer = 1 << 13, | ||
62 | Modify = 1 << 14, | ||
63 | Copy = 1 << 15, | ||
64 | Export = 1 << 16, | ||
65 | Move = 1 << 19, | ||
66 | Damage = 1 << 20, | ||
67 | // All does not contain Export, which is special and must be | ||
68 | // explicitly given | ||
69 | All = (1 << 13) | (1 << 14) | (1 << 15) | (1 << 19) | ||
70 | } | ||
71 | |||
57 | /// <summary> | 72 | /// <summary> |
58 | /// The method used by Util.FireAndForget for asynchronously firing events | 73 | /// The method used by Util.FireAndForget for asynchronously firing events |
59 | /// </summary> | 74 | /// </summary> |