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

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
Justin Clark-Casey (justincc) 2012-09-25 23:12:28 +01:00 committed by Melanie
parent 1efa87ba38
commit 7d6ac75f87
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
View File

@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
private string m_description = String.Empty; private string m_description = String.Empty;
private bool m_dumpAssetToFile; private bool m_dumpAssetToFile;
private string m_name = String.Empty; private string m_name = String.Empty;
private bool m_storeLocal; // private bool m_storeLocal;
private uint nextPerm = 0; private uint nextPerm = 0;
private IClientAPI ourClient; private IClientAPI ourClient;
@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
m_asset.Local = storeLocal; m_asset.Local = storeLocal;
m_asset.Temporary = tempFile; m_asset.Temporary = tempFile;
m_storeLocal = storeLocal; // m_storeLocal = storeLocal;
if (m_asset.Data.Length > 2) if (m_asset.Data.Length > 2)
{ {
@ -258,10 +258,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
m_transactions.RemoveXferUploader(m_transactionID); m_transactions.RemoveXferUploader(m_transactionID);
} }
else if (m_storeLocal) // else if (m_storeLocal)
{ // {
m_Scene.AssetService.Store(m_asset); // m_Scene.AssetService.Store(m_asset);
} // }
} }
m_log.DebugFormat( m_log.DebugFormat(