Remove manually permissions settings on all current library items so that they use the defaults instead.

Some items had completely wrong permissions - this is easier than correcting them all.
The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts)

3 files changed, 15 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index b714f2b..4933147 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -984,11 +984,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         public virtual bool CanGetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID)
         {
             InventoryItemBase assetRequestItem = GetItem(remoteClient.AgentId, itemID);
+
             if (assetRequestItem == null)
             {
                 ILibraryService lib = m_Scene.RequestModuleInterface<ILibraryService>();
+
                 if (lib != null)
                     assetRequestItem = lib.LibraryRootFolder.FindItem(itemID);
+
                 if (assetRequestItem == null)
                     return false;
             }
@@ -1019,6 +1022,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 m_log.WarnFormat(
                     "[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}",
                     Name, requestID, itemID, assetRequestItem.AssetID);
+
                 return false;
             }
 
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index d570608..2ef4457 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -185,6 +185,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
                         archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName, false);
                         archread.Execute();
                     }
+
                     foreach (InventoryNodeBase node in nodes)
                         FixPerms(node);
                 }
@@ -197,18 +198,23 @@ namespace OpenSim.Region.CoreModules.Framework.Library
                     archread.Close();
                 }
             }
-
         }
 
         private void FixPerms(InventoryNodeBase node)
         {
+            m_log.DebugFormat("[LIBRARY MODULE]: Fixing perms for {0} {1}", node.Name, node.ID);
+
             if (node is InventoryItemBase)
             {
                 InventoryItemBase item = (InventoryItemBase)node;
+//                item.BasePermissions = (uint)PermissionMask.All;
                 item.BasePermissions = 0x7FFFFFFF;
                 item.EveryOnePermissions = 0x7FFFFFFF;
                 item.CurrentPermissions = 0x7FFFFFFF;
                 item.NextPermissions = 0x7FFFFFFF;
+//                item.EveryOnePermissions = (uint)PermissionMask.Copy;
+//                item.CurrentPermissions = (uint)PermissionMask.None;
+//                item.NextPermissions = (uint)PermissionMask.All;
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 30421d4..afc1a4f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -724,7 +724,10 @@ namespace OpenSim.Region.Framework.Scenes
                     newName = item.Name;
                 }
 
-                if (remoteClient.AgentId == oldAgentID || (LibraryService != null && LibraryService.LibraryRootFolder != null && oldAgentID == LibraryService.LibraryRootFolder.Owner))
+                if (remoteClient.AgentId == oldAgentID
+                    || (LibraryService != null
+                        && LibraryService.LibraryRootFolder != null
+                        && oldAgentID == LibraryService.LibraryRootFolder.Owner))
                 {
                     CreateNewInventoryItem(
                         remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,