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

try to validate textures from library folder

avinationmerge
UbitUmarov 2015-09-12 07:24:35 +01:00
parent 118aff520e
commit 8e920ac59d
1 changed files with 14 additions and 0 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,6 +472,17 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
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()
{
@ -527,6 +538,9 @@ 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)