Comment out old m_storeLocal from AssetXferUploader.
This was only used if none of new item, update item or update task item had been set. But since all transactions go through these paths this old code is redundant.avinationmerge
parent
1efa87ba38
commit
7d6ac75f87
|
@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
|
|||
private string m_description = String.Empty;
|
||||
private bool m_dumpAssetToFile;
|
||||
private string m_name = String.Empty;
|
||||
private bool m_storeLocal;
|
||||
// private bool m_storeLocal;
|
||||
private uint nextPerm = 0;
|
||||
private IClientAPI ourClient;
|
||||
|
||||
|
@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
|
|||
m_asset.Local = storeLocal;
|
||||
m_asset.Temporary = tempFile;
|
||||
|
||||
m_storeLocal = storeLocal;
|
||||
// m_storeLocal = storeLocal;
|
||||
|
||||
if (m_asset.Data.Length > 2)
|
||||
{
|
||||
|
@ -258,10 +258,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
|
|||
|
||||
m_transactions.RemoveXferUploader(m_transactionID);
|
||||
}
|
||||
else if (m_storeLocal)
|
||||
{
|
||||
m_Scene.AssetService.Store(m_asset);
|
||||
}
|
||||
// else if (m_storeLocal)
|
||||
// {
|
||||
// m_Scene.AssetService.Store(m_asset);
|
||||
// }
|
||||
}
|
||||
|
||||
m_log.DebugFormat(
|
||||
|
|
Loading…
Reference in New Issue