Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 12 insertions, 8 deletions

diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index 5a36332..e188665 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,6 +128,10 @@ namespace OpenSim.Tests.Common
             item.Owner = userId;
             item.AssetType = asset.Type;
             item.InvType = (int)itemType;
+            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);
 
             InventoryFolderBase folder = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, userId, path)[0];
 
@@ -207,7 +211,7 @@ namespace OpenSim.Tests.Common
         /// </param>
         /// <param name="useExistingFolders">
         /// 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.
         /// </param>
@@ -232,7 +236,7 @@ namespace OpenSim.Tests.Common
         /// </param>
         /// <param name="useExistingFolders">
         /// 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.
         /// </param>
@@ -255,7 +259,7 @@ namespace OpenSim.Tests.Common
         /// Create inventory folders starting from a given parent folder
         /// </summary>
         /// <remarks>
-        /// 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.
         /// </remarks>
@@ -267,7 +271,7 @@ namespace OpenSim.Tests.Common
         /// </param>
         /// <param name="useExistingFolders">
         /// 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.
         /// </param>
@@ -295,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
@@ -367,4 +371,4 @@ namespace OpenSim.Tests.Common
             return InventoryArchiveUtils.FindItemsByPath(inventoryService, userId, path);
         }
     }
-}
\ No newline at end of file
+}