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/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |
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/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index a391275..36325ce 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -38,12 +38,14 @@ using OpenSim.Framework; | |||
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
41 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
41 | 42 | ||
42 | namespace OpenSim.Services.Connectors.SimianGrid | 43 | namespace OpenSim.Services.Connectors.SimianGrid |
43 | { | 44 | { |
44 | /// <summary> | 45 | /// <summary> |
45 | /// Permissions bitflags | 46 | /// Permissions bitflags |
46 | /// </summary> | 47 | /// </summary> |
48 | /* | ||
47 | [Flags] | 49 | [Flags] |
48 | public enum PermissionMask : uint | 50 | public enum PermissionMask : uint |
49 | { | 51 | { |
@@ -55,6 +57,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
55 | Damage = 1 << 20, | 57 | Damage = 1 << 20, |
56 | All = 0x7FFFFFFF | 58 | All = 0x7FFFFFFF |
57 | } | 59 | } |
60 | */ | ||
58 | 61 | ||
59 | /// <summary> | 62 | /// <summary> |
60 | /// Connects avatar inventories to the SimianGrid backend | 63 | /// Connects avatar inventories to the SimianGrid backend |