diff options
Diffstat (limited to '')
3 files changed, 6 insertions, 1 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 |
diff --git a/OpenSim/Services/InventoryService/LibraryService.cs b/OpenSim/Services/InventoryService/LibraryService.cs index f90895b..c4a5572 100644 --- a/OpenSim/Services/InventoryService/LibraryService.cs +++ b/OpenSim/Services/InventoryService/LibraryService.cs | |||
@@ -38,6 +38,7 @@ using OpenSim.Services.Interfaces; | |||
38 | using log4net; | 38 | using log4net; |
39 | using Nini.Config; | 39 | using Nini.Config; |
40 | using OpenMetaverse; | 40 | using OpenMetaverse; |
41 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
41 | 42 | ||
42 | namespace OpenSim.Services.InventoryService | 43 | namespace OpenSim.Services.InventoryService |
43 | { | 44 | { |
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index a4f1bba..772ab97 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 | { |
@@ -684,4 +685,4 @@ namespace OpenSim.Services.UserAccountService | |||
684 | } | 685 | } |
685 | } | 686 | } |
686 | } | 687 | } |
687 | } \ No newline at end of file | 688 | } |