Merge branch 'master' of ssh://TOR/var/git/careminster

avinationmerge
CasperW 2010-02-15 06:15:14 +01:00
commit 47a9e48f46
1 changed files with 3 additions and 0 deletions

View File

@ -585,6 +585,9 @@ namespace OpenSim.Region.Framework.Scenes
m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString()); m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString());
return; return;
} }
if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
return;
} }
AssetBase asset = AssetService.Get(item.AssetID.ToString()); AssetBase asset = AssetService.Get(item.AssetID.ToString());