aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-09-12 12:51:47 +0100
committerUbitUmarov2015-09-12 12:51:47 +0100
commit0eba5d25c3f05c2492ad9ebb8e2af61197db0a47 (patch)
treeab70d2346fa7b2164bdfb75278e51ec4bb21ed18 /OpenSim
parent try to validate textures from library folder (diff)
downloadopensim-SC_OLD-0eba5d25c3f05c2492ad9ebb8e2af61197db0a47.zip
opensim-SC_OLD-0eba5d25c3f05c2492ad9ebb8e2af61197db0a47.tar.gz
opensim-SC_OLD-0eba5d25c3f05c2492ad9ebb8e2af61197db0a47.tar.bz2
opensim-SC_OLD-0eba5d25c3f05c2492ad9ebb8e2af61197db0a47.tar.xz
revert validating Library textures. Those need to be on a grid assets or will not work anyway
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs14
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 01d9aad..c14e89f 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
472 m_transactions.RemoveXferUploader(m_transactionID); 472 m_transactions.RemoveXferUploader(m_transactionID);
473 } 473 }
474 474
475 private int checkLibrary(UUID itemID)
476 {
477 ILibraryService m_library = m_Scene.RequestModuleInterface<ILibraryService>();
478 InventoryItemBase item = null;
479 if (m_library != null)
480 item = m_library.LibraryRootFolder.FindAsset(itemID);
481
482 if (item == null)
483 return 0;
484 return (int)item.CurrentPermissions;
485 }
486 475
487 private void ValidateAssets() 476 private void ValidateAssets()
488 { 477 {
@@ -538,9 +527,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
538 else 527 else
539 { 528 {
540 int perms = m_Scene.InventoryService.GetAssetPermissions(ourClient.AgentId, tx); 529 int perms = m_Scene.InventoryService.GetAssetPermissions(ourClient.AgentId, tx);
541 if (perms == 0)
542 perms = checkLibrary(tx);
543
544 int full = (int)(PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Copy); 530 int full = (int)(PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Copy);
545 531
546 if ((perms & full) != full) 532 if ((perms & full) != full)