aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/UserAccountService/UserAccountService.cs
diff options
context:
space:
mode:
authorMelanie2013-03-26 03:40:06 +0000
committerMelanie2013-03-26 03:40:06 +0000
commit5f4c4df227025c6b6156ce8238b56553dca4b5ae (patch)
treeb090b809346ba8e39db1e08ca24933e64dae8ab9 /OpenSim/Services/UserAccountService/UserAccountService.cs
parentBulletSim: new algorithm for vertical attraction which uses quaternion (diff)
downloadopensim-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.cs3
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;
36using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using GridRegion = OpenSim.Services.Interfaces.GridRegion; 38using GridRegion = OpenSim.Services.Interfaces.GridRegion;
39using PermissionMask = OpenSim.Framework.PermissionMask;
39 40
40namespace OpenSim.Services.UserAccountService 41namespace 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}