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/Connectors/SimianGrid | |
| 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/Connectors/SimianGrid')
| -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 |