diff options
| author | Melanie | 2013-03-26 03:26:28 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-26 03:26:28 +0000 |
| commit | 36c57bac8e86b5c64c5ef89a0dc24e55662ad34c (patch) | |
| tree | db7079f27f7209f5eacdd27e9a25903d56030032 /OpenSim/Services/InventoryService/LibraryService.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask (diff) | |
| download | opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.zip opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.gz opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.bz2 opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Services/InventoryService/LibraryService.cs')
| -rw-r--r-- | OpenSim/Services/InventoryService/LibraryService.cs | 1 |
1 files changed, 1 insertions, 0 deletions
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 | { |