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/Avatar | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| download | opensim-SC-c341664c1b8ccf3bd7b81795b900b971a15ff318.zip opensim-SC-c341664c1b8ccf3bd7b81795b900b971a15ff318.tar.gz opensim-SC-c341664c1b8ccf3bd7b81795b900b971a15ff318.tar.bz2 opensim-SC-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/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 51fe1ea..bc79944 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -40,6 +40,7 @@ using OpenSim.Region.Framework.Scenes; | |||
| 40 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
| 41 | 41 | ||
| 42 | using Mono.Addins; | 42 | using Mono.Addins; |
| 43 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
| 43 | 44 | ||
| 44 | namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | 45 | namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory |
| 45 | { | 46 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs index 5ec0ea9..b44a5c9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs | |||
| @@ -36,6 +36,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
| 36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
| 37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
| 38 | using Mono.Addins; | 38 | using Mono.Addins; |
| 39 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
| 39 | 40 | ||
| 40 | namespace OpenSim.Region.CoreModules.Avatar.Friends | 41 | namespace OpenSim.Region.CoreModules.Avatar.Friends |
| 41 | { | 42 | { |