From fcaa4f601231a6feb7fd5ea40e35fba6220c6235 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Jul 2011 02:05:51 +0100
Subject: Revert "Don't load current/next/everyone/base permissions from the
 library item xml files - always use PermissionMask.All instead (which was the
 existing default)."

There actually are uses for this.  I will correct the perms instead since some entries appear to be wrong.

This reverts commit 667b54f5a2a04fa5a2859397868d270eab3913f1.
---
 OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/Library')

diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index 2ef4457..d570608 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -185,7 +185,6 @@ namespace OpenSim.Region.CoreModules.Framework.Library
                         archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName, false);
                         archread.Execute();
                     }
-
                     foreach (InventoryNodeBase node in nodes)
                         FixPerms(node);
                 }
@@ -198,23 +197,18 @@ 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;
             }
         }
 
-- 
cgit v1.1