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/Services/UserAccountService/UserAccountService.cs | |
| 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/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 | } |