From 0eba5d25c3f05c2492ad9ebb8e2af61197db0a47 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 12 Sep 2015 12:51:47 +0100 Subject: [PATCH] revert validating Library textures. Those need to be on a grid assets or will not work anyway --- .../Agent/AssetTransaction/AssetXferUploader.cs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index 01d9aadf8c..c14e89fb7c 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs @@ -472,17 +472,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction m_transactions.RemoveXferUploader(m_transactionID); } - private int checkLibrary(UUID itemID) - { - ILibraryService m_library = m_Scene.RequestModuleInterface(); - InventoryItemBase item = null; - if (m_library != null) - item = m_library.LibraryRootFolder.FindAsset(itemID); - - if (item == null) - return 0; - return (int)item.CurrentPermissions; - } private void ValidateAssets() { @@ -538,9 +527,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction else { int perms = m_Scene.InventoryService.GetAssetPermissions(ourClient.AgentId, tx); - if (perms == 0) - perms = checkLibrary(tx); - int full = (int)(PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Copy); if ((perms & full) != full)