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/Services/UserAccountService/UserAccountService.cs | |
parent | BulletSim: new algorithm for vertical attraction which uses quaternion (diff) | |
download | opensim-SC-5f4c4df227025c6b6156ce8238b56553dca4b5ae.zip opensim-SC-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.gz opensim-SC-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.bz2 opensim-SC-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/Services/UserAccountService/UserAccountService.cs')
-rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 5b4d040..1852e4f 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -36,6 +36,7 @@ using OpenSim.Framework; | |||
36 | using OpenSim.Services.Interfaces; | 36 | using OpenSim.Services.Interfaces; |
37 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
38 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 38 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
39 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
39 | 40 | ||
40 | namespace OpenSim.Services.UserAccountService | 41 | namespace OpenSim.Services.UserAccountService |
41 | { | 42 | { |
@@ -665,4 +666,4 @@ namespace OpenSim.Services.UserAccountService | |||
665 | } | 666 | } |
666 | } | 667 | } |
667 | } | 668 | } |
668 | } \ No newline at end of file | 669 | } |