1 files changed, 19 insertions, 13 deletions

diff --git a/OpenSim/Services/InventoryService/LibraryService.cs b/OpenSim/Services/InventoryService/LibraryService.cs
index c71295d..de1c784 100644
--- a/OpenSim/Services/InventoryService/LibraryService.cs
+++ b/OpenSim/Services/InventoryService/LibraryService.cs
@@ -69,6 +69,11 @@ namespace OpenSim.Services.InventoryService
         static protected Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>(256);
         static LibraryService m_root;
         static object m_rootLock = new object();
+        static readonly uint m_BasePermissions = (uint)PermissionMask.AllAndExport;
+        static readonly uint m_EveryOnePermissions = (uint)PermissionMask.AllAndExportNoMod;
+        static readonly uint m_CurrentPermissions = (uint)PermissionMask.AllAndExport;
+        static readonly uint m_NextPermissions = (uint)PermissionMask.AllAndExport;
+        static readonly uint m_GroupPermissions = 0;
 
         public LibraryService(IConfigSource config):base(config)
         {
@@ -96,8 +101,8 @@ namespace OpenSim.Services.InventoryService
             m_LibraryRootFolder.ID = new UUID("00000112-000f-0000-0000-000100bba000");
             m_LibraryRootFolder.Name = pLibName;
             m_LibraryRootFolder.ParentID = UUID.Zero;
-            m_LibraryRootFolder.Type = (short)8;
-            m_LibraryRootFolder.Version = (ushort)1;
+            m_LibraryRootFolder.Type = 8;
+            m_LibraryRootFolder.Version = 1;
 
             libraryFolders.Add(m_LibraryRootFolder.ID, m_LibraryRootFolder);
 
@@ -117,10 +122,11 @@ namespace OpenSim.Services.InventoryService
             item.AssetType = assetType;
             item.InvType = invType;
             item.Folder = parentFolderID;
-            item.BasePermissions = 0x7FFFFFFF;
-            item.EveryOnePermissions = 0x7FFFFFFF;
-            item.CurrentPermissions = 0x7FFFFFFF;
-            item.NextPermissions = 0x7FFFFFFF;
+            item.BasePermissions = m_BasePermissions;
+            item.EveryOnePermissions = m_EveryOnePermissions;
+            item.CurrentPermissions = m_CurrentPermissions;
+            item.NextPermissions = m_NextPermissions;
+            item.GroupPermissions = m_GroupPermissions;
             return item;
         }
 
@@ -142,6 +148,7 @@ namespace OpenSim.Services.InventoryService
         protected void ReadLibraryFromConfig(IConfig config, string path)
         {
             string basePath = Path.GetDirectoryName(path);
+            m_LibraryRootFolder.Version = (ushort)config.GetInt("RootVersion", 1);
             string foldersPath
                 = Path.Combine(
                     basePath, config.GetString("foldersFile", String.Empty));
@@ -167,9 +174,8 @@ namespace OpenSim.Services.InventoryService
             folderInfo.Name = config.GetString("name", "unknown");
             folderInfo.ParentID = new UUID(config.GetString("parentFolderID", m_LibraryRootFolder.ID.ToString()));
             folderInfo.Type = (short)config.GetInt("type", 8);
-
+            folderInfo.Version = (ushort)config.GetInt("version", 1);
             folderInfo.Owner = libOwner;
-            folderInfo.Version = 1;
 
             if (libraryFolders.ContainsKey(folderInfo.ParentID))
             {
@@ -205,11 +211,11 @@ namespace OpenSim.Services.InventoryService
             item.Description = config.GetString("description", item.Name);
             item.InvType = config.GetInt("inventoryType", 0);
             item.AssetType = config.GetInt("assetType", item.InvType);
-            item.CurrentPermissions = (uint)config.GetLong("currentPermissions", (uint)PermissionMask.All);
-            item.NextPermissions = (uint)config.GetLong("nextPermissions", (uint)PermissionMask.All);
-            item.EveryOnePermissions
-                = (uint)config.GetLong("everyonePermissions", (uint)PermissionMask.All - (uint)PermissionMask.Modify);
-            item.BasePermissions = (uint)config.GetLong("basePermissions", (uint)PermissionMask.All);
+            item.CurrentPermissions = (uint)config.GetLong("currentPermissions", m_CurrentPermissions);
+            item.NextPermissions = (uint)config.GetLong("nextPermissions", m_NextPermissions);
+            item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", m_EveryOnePermissions);
+            item.BasePermissions = (uint)config.GetLong("basePermissions", m_BasePermissions);
+            item.GroupPermissions = (uint)config.GetLong("basePermissions", m_GroupPermissions);;
             item.Flags = (uint)config.GetInt("flags", 0);
 
             if (libraryFolders.ContainsKey(item.Folder))