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

Don't copy assets to foreign asset servers when the objects are being deleted 

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
LSLKeyTest
Diva Canto 2016-06-05 16:43:28 -07:00
parent 48915377a6
commit c4c3163db9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
View File

@ -209,7 +209,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
} }
public void PostInventoryAsset(InventoryItemBase item, int userlevel) private void PostInventoryAsset(InventoryItemBase item, int userlevel)
{
InventoryFolderBase f = m_Scene.InventoryService.GetFolderForType(item.Owner, FolderType.Trash);
if (f == null || (f != null && item.Folder != f.ID))
PostInventoryAsset(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel);
}
private void PostInventoryAsset(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel)
{ {
if (item.AssetType == (int)AssetType.Link) if (item.AssetType == (int)AssetType.Link)
return; return;

2
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -566,7 +566,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
// This is a hook to do some per-asset post-processing for subclasses that need that // This is a hook to do some per-asset post-processing for subclasses that need that
if (remoteClient != null) if (remoteClient != null && action != DeRezAction.Delete)
ExportAsset(remoteClient.AgentId, asset.FullID); ExportAsset(remoteClient.AgentId, asset.FullID);
return item; return item;