diff options
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs index e7e145a..5a46201 100644 --- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | |||
@@ -101,7 +101,7 @@ namespace OpenSim.Tests.Common | |||
101 | Scene scene, string itemName, UUID itemId, InventoryType itemType, AssetBase asset, UUID userId) | 101 | Scene scene, string itemName, UUID itemId, InventoryType itemType, AssetBase asset, UUID userId) |
102 | { | 102 | { |
103 | return AddInventoryItem( | 103 | return AddInventoryItem( |
104 | scene, itemName, itemId, itemType, asset, userId, | 104 | scene, itemName, itemId, itemType, asset, userId, |
105 | scene.InventoryService.GetFolderForType(userId, (FolderType)asset.Type).Name); | 105 | scene.InventoryService.GetFolderForType(userId, (FolderType)asset.Type).Name); |
106 | } | 106 | } |
107 | 107 | ||
@@ -128,7 +128,7 @@ namespace OpenSim.Tests.Common | |||
128 | item.Owner = userId; | 128 | item.Owner = userId; |
129 | item.AssetType = asset.Type; | 129 | item.AssetType = asset.Type; |
130 | item.InvType = (int)itemType; | 130 | item.InvType = (int)itemType; |
131 | item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | | 131 | item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | |
132 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); | 132 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); |
133 | item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All | | 133 | item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All | |
134 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); | 134 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); |
@@ -211,7 +211,7 @@ namespace OpenSim.Tests.Common | |||
211 | /// </param> | 211 | /// </param> |
212 | /// <param name="useExistingFolders"> | 212 | /// <param name="useExistingFolders"> |
213 | /// If true, then folders in the path which already the same name are | 213 | /// If true, then folders in the path which already the same name are |
214 | /// used. This applies to the terminal folder as well. | 214 | /// used. This applies to the terminal folder as well. |
215 | /// If false, then all folders in the path are created, even if there is already a folder at a particular | 215 | /// If false, then all folders in the path are created, even if there is already a folder at a particular |
216 | /// level with the same name. | 216 | /// level with the same name. |
217 | /// </param> | 217 | /// </param> |
@@ -236,7 +236,7 @@ namespace OpenSim.Tests.Common | |||
236 | /// </param> | 236 | /// </param> |
237 | /// <param name="useExistingFolders"> | 237 | /// <param name="useExistingFolders"> |
238 | /// If true, then folders in the path which already the same name are | 238 | /// If true, then folders in the path which already the same name are |
239 | /// used. This applies to the terminal folder as well. | 239 | /// used. This applies to the terminal folder as well. |
240 | /// If false, then all folders in the path are created, even if there is already a folder at a particular | 240 | /// If false, then all folders in the path are created, even if there is already a folder at a particular |
241 | /// level with the same name. | 241 | /// level with the same name. |
242 | /// </param> | 242 | /// </param> |
@@ -259,7 +259,7 @@ namespace OpenSim.Tests.Common | |||
259 | /// Create inventory folders starting from a given parent folder | 259 | /// Create inventory folders starting from a given parent folder |
260 | /// </summary> | 260 | /// </summary> |
261 | /// <remarks> | 261 | /// <remarks> |
262 | /// If any stem of the path names folders that already exist then these are not recreated. This includes the | 262 | /// If any stem of the path names folders that already exist then these are not recreated. This includes the |
263 | /// final folder. | 263 | /// final folder. |
264 | /// TODO: May need to make it an option to create duplicate folders. | 264 | /// TODO: May need to make it an option to create duplicate folders. |
265 | /// </remarks> | 265 | /// </remarks> |
@@ -271,7 +271,7 @@ namespace OpenSim.Tests.Common | |||
271 | /// </param> | 271 | /// </param> |
272 | /// <param name="useExistingFolders"> | 272 | /// <param name="useExistingFolders"> |
273 | /// If true, then folders in the path which already the same name are | 273 | /// If true, then folders in the path which already the same name are |
274 | /// used. This applies to the terminal folder as well. | 274 | /// used. This applies to the terminal folder as well. |
275 | /// If false, then all folders in the path are created, even if there is already a folder at a particular | 275 | /// If false, then all folders in the path are created, even if there is already a folder at a particular |
276 | /// level with the same name. | 276 | /// level with the same name. |
277 | /// </param> | 277 | /// </param> |
@@ -299,10 +299,10 @@ namespace OpenSim.Tests.Common | |||
299 | else | 299 | else |
300 | folderIdForCreate = folderId; | 300 | folderIdForCreate = folderId; |
301 | 301 | ||
302 | folder | 302 | folder |
303 | = new InventoryFolderBase( | 303 | = new InventoryFolderBase( |
304 | folderIdForCreate, components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0); | 304 | folderIdForCreate, components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0); |
305 | 305 | ||
306 | inventoryService.AddFolder(folder); | 306 | inventoryService.AddFolder(folder); |
307 | } | 307 | } |
308 | // else | 308 | // else |