OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert validating Library textures. Those need to be on a grid assets or will not work anyway

avinationmerge
UbitUmarov 2015-09-12 12:51:47 +01:00
parent 8e920ac59d
commit 0eba5d25c3
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
View File

@ -472,17 +472,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
m_transactions.RemoveXferUploader(m_transactionID); m_transactions.RemoveXferUploader(m_transactionID);
} }
private int checkLibrary(UUID itemID)
{
ILibraryService m_library = m_Scene.RequestModuleInterface<ILibraryService>();
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() private void ValidateAssets()
{ {
@ -538,9 +527,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
else else
{ {
int perms = m_Scene.InventoryService.GetAssetPermissions(ourClient.AgentId, tx); int perms = m_Scene.InventoryService.GetAssetPermissions(ourClient.AgentId, tx);
if (perms == 0)
perms = checkLibrary(tx);
int full = (int)(PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Copy); int full = (int)(PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Copy);
if ((perms & full) != full) if ((perms & full) != full)