diff options
| author | Justin Clark-Casey (justincc) | 2013-03-26 20:32:22 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-03-26 20:32:22 +0000 |
| commit | 13170ca627d266bbd53cd32fa71a5caa47f6fb98 (patch) | |
| tree | 1398da06f070a14d6741b1418e3ce0bbcb705381 /OpenSim/Framework | |
| parent | Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars i... (diff) | |
| parent | Implement a pref to turn on the simulator ExportSupported feature entry. (diff) | |
| download | opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.zip opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.gz opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.bz2 opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -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 94a172c..bde4673 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> |