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/Framework/Scenes/SceneObjectGroup.Inventory.cs | |
| 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/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index 26524fb..f8624e7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |||
| @@ -34,6 +34,7 @@ using OpenSim.Framework; | |||
| 34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
| 35 | using System.Collections.Generic; | 35 | using System.Collections.Generic; |
| 36 | using System.Xml; | 36 | using System.Xml; |
| 37 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
| 37 | 38 | ||
| 38 | namespace OpenSim.Region.Framework.Scenes | 39 | namespace OpenSim.Region.Framework.Scenes |
| 39 | { | 40 | { |