diff options
author | Justin Clark-Casey (justincc) | 2011-07-23 02:05:51 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-23 02:05:51 +0100 |
commit | fcaa4f601231a6feb7fd5ea40e35fba6220c6235 (patch) | |
tree | 003517e08cd61bccc1263ab992d09c576aa25ab4 /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
parent | Don't load current/next/everyone/base permissions from the library item xml f... (diff) | |
download | opensim-SC_OLD-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.zip opensim-SC_OLD-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.tar.gz opensim-SC_OLD-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.tar.bz2 opensim-SC_OLD-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/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 4933147..b714f2b 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -984,14 +984,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
984 | public virtual bool CanGetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID) | 984 | public virtual bool CanGetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID) |
985 | { | 985 | { |
986 | InventoryItemBase assetRequestItem = GetItem(remoteClient.AgentId, itemID); | 986 | InventoryItemBase assetRequestItem = GetItem(remoteClient.AgentId, itemID); |
987 | |||
988 | if (assetRequestItem == null) | 987 | if (assetRequestItem == null) |
989 | { | 988 | { |
990 | ILibraryService lib = m_Scene.RequestModuleInterface<ILibraryService>(); | 989 | ILibraryService lib = m_Scene.RequestModuleInterface<ILibraryService>(); |
991 | |||
992 | if (lib != null) | 990 | if (lib != null) |
993 | assetRequestItem = lib.LibraryRootFolder.FindItem(itemID); | 991 | assetRequestItem = lib.LibraryRootFolder.FindItem(itemID); |
994 | |||
995 | if (assetRequestItem == null) | 992 | if (assetRequestItem == null) |
996 | return false; | 993 | return false; |
997 | } | 994 | } |
@@ -1022,7 +1019,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
1022 | m_log.WarnFormat( | 1019 | m_log.WarnFormat( |
1023 | "[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}", | 1020 | "[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}", |
1024 | Name, requestID, itemID, assetRequestItem.AssetID); | 1021 | Name, requestID, itemID, assetRequestItem.AssetID); |
1025 | |||
1026 | return false; | 1022 | return false; |
1027 | } | 1023 | } |
1028 | 1024 | ||