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

Reinstate the part of the id theft protection that was lost in a long ago merge

avinationmerge
Melanie Thielker 2014-09-27 21:17:56 +02:00
parent 3ea76e3131
commit f60139cb91
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
View File

@ -172,6 +172,16 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
{ {
AssetXferUploader uploader = RequestXferUploader(transactionID); AssetXferUploader uploader = RequestXferUploader(transactionID);
// Here we need to get the old asset to extract the
// texture UUIDs if it's a wearable.
if (item.Type == (int)AssetType.Bodypart ||
item.Type == (int)AssetType.Clothing)
{
AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
if (oldAsset != null)
uploader.SetOldData(oldAsset.Data);
}
uploader.RequestUpdateTaskInventoryItem(remoteClient, item); uploader.RequestUpdateTaskInventoryItem(remoteClient, item);
} }
@ -180,6 +190,16 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
{ {
AssetXferUploader uploader = RequestXferUploader(transactionID); AssetXferUploader uploader = RequestXferUploader(transactionID);
// Here we need to get the old asset to extract the
// texture UUIDs if it's a wearable.
if (item.AssetType == (int)AssetType.Bodypart ||
item.AssetType == (int)AssetType.Clothing)
{
AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
if (oldAsset != null)
uploader.SetOldData(oldAsset.Data);
}
uploader.RequestUpdateInventoryItem(remoteClient, item); uploader.RequestUpdateInventoryItem(remoteClient, item);
} }
} }