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/Region/CoreModules/World/Permissions | |
| 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/Region/CoreModules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 121fb2a..79dd4a0 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -38,6 +38,7 @@ using OpenSim.Region.Framework.Scenes; | |||
| 38 | using OpenSim.Services.Interfaces; | 38 | using OpenSim.Services.Interfaces; |
| 39 | 39 | ||
| 40 | using Mono.Addins; | 40 | using Mono.Addins; |
| 41 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
| 41 | 42 | ||
| 42 | namespace OpenSim.Region.CoreModules.World.Permissions | 43 | namespace OpenSim.Region.CoreModules.World.Permissions |
| 43 | { | 44 | { |