From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 5 Jan 2017 19:07:37 +0000 Subject: Massive tab and trailing space cleanup --- OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs') 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 Scene scene, string itemName, UUID itemId, InventoryType itemType, AssetBase asset, UUID userId) { return AddInventoryItem( - scene, itemName, itemId, itemType, asset, userId, + scene, itemName, itemId, itemType, asset, userId, scene.InventoryService.GetFolderForType(userId, (FolderType)asset.Type).Name); } @@ -128,7 +128,7 @@ namespace OpenSim.Tests.Common item.Owner = userId; item.AssetType = asset.Type; item.InvType = (int)itemType; - item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | + item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); @@ -211,7 +211,7 @@ namespace OpenSim.Tests.Common /// /// /// If true, then folders in the path which already the same name are - /// used. This applies to the terminal folder as well. + /// used. This applies to the terminal folder as well. /// If false, then all folders in the path are created, even if there is already a folder at a particular /// level with the same name. /// @@ -236,7 +236,7 @@ namespace OpenSim.Tests.Common /// /// /// If true, then folders in the path which already the same name are - /// used. This applies to the terminal folder as well. + /// used. This applies to the terminal folder as well. /// If false, then all folders in the path are created, even if there is already a folder at a particular /// level with the same name. /// @@ -259,7 +259,7 @@ namespace OpenSim.Tests.Common /// Create inventory folders starting from a given parent folder /// /// - /// If any stem of the path names folders that already exist then these are not recreated. This includes the + /// If any stem of the path names folders that already exist then these are not recreated. This includes the /// final folder. /// TODO: May need to make it an option to create duplicate folders. /// @@ -271,7 +271,7 @@ namespace OpenSim.Tests.Common /// /// /// If true, then folders in the path which already the same name are - /// used. This applies to the terminal folder as well. + /// used. This applies to the terminal folder as well. /// If false, then all folders in the path are created, even if there is already a folder at a particular /// level with the same name. /// @@ -299,10 +299,10 @@ namespace OpenSim.Tests.Common else folderIdForCreate = folderId; - folder + folder = new InventoryFolderBase( folderIdForCreate, components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0); - + inventoryService.AddFolder(folder); } // else -- cgit v1.1