aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-23 02:05:51 +0100
committerJustin Clark-Casey (justincc)2011-07-23 02:05:51 +0100
commitfcaa4f601231a6feb7fd5ea40e35fba6220c6235 (patch)
tree003517e08cd61bccc1263ab992d09c576aa25ab4 /OpenSim/Framework
parentDon't load current/next/everyone/base permissions from the library item xml f... (diff)
downloadopensim-SC-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.zip
opensim-SC-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.tar.gz
opensim-SC-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.tar.bz2
opensim-SC-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/InventoryFolderImpl.cs8
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Framework/InventoryFolderImpl.cs b/OpenSim/Framework/InventoryFolderImpl.cs
index 139776b..29c7682 100644
--- a/OpenSim/Framework/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/InventoryFolderImpl.cs
@@ -27,15 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
31using log4net;
32using OpenMetaverse; 30using OpenMetaverse;
33 31
34namespace OpenSim.Framework 32namespace OpenSim.Framework
35{ 33{
36 public class InventoryFolderImpl : InventoryFolderBase 34 public class InventoryFolderImpl : InventoryFolderBase
37 { 35 {
38// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 36 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 37
40 public static readonly string PATH_DELIMITER = "/"; 38 public static readonly string PATH_DELIMITER = "/";
41 39
@@ -404,10 +402,6 @@ namespace OpenSim.Framework
404 { 402 {
405 foreach (InventoryItemBase item in Items.Values) 403 foreach (InventoryItemBase item in Items.Values)
406 { 404 {
407// m_log.DebugFormat(
408// "[INVENTORY FOLDER IMPL]: Returning item {0} {1}, OwnerPermissions {2:X}",
409// item.Name, item.ID, item.CurrentPermissions);
410
411 itemList.Add(item); 405 itemList.Add(item);
412 } 406 }
413 } 407 }