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/ApplicationPlugins/RemoteController | |
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/ApplicationPlugins/RemoteController')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 49fc566..f19e391 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -50,6 +50,7 @@ using OpenSim.Region.Framework.Scenes; | |||
50 | using OpenSim.Services.Interfaces; | 50 | using OpenSim.Services.Interfaces; |
51 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; | 51 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; |
52 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 52 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
53 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
53 | 54 | ||
54 | namespace OpenSim.ApplicationPlugins.RemoteController | 55 | namespace OpenSim.ApplicationPlugins.RemoteController |
55 | { | 56 | { |