aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-09-25 23:12:28 +0100
committerJustin Clark-Casey (justincc)2012-09-25 23:13:45 +0100
commitb96a53962b86083476b78498278868ce8152ddd8 (patch)
tree06fa256414ec514cea271af0e71c3d966add861f /OpenSim/Region/CoreModules
parentInsert transaction ID into AssetXferUploader constructor rather than at Uploa... (diff)
downloadopensim-SC_OLD-b96a53962b86083476b78498278868ce8152ddd8.zip
opensim-SC_OLD-b96a53962b86083476b78498278868ce8152ddd8.tar.gz
opensim-SC_OLD-b96a53962b86083476b78498278868ce8152ddd8.tar.bz2
opensim-SC_OLD-b96a53962b86083476b78498278868ce8152ddd8.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 52d7d57..8d21202 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
77 private string m_description = String.Empty; 77 private string m_description = String.Empty;
78 private bool m_dumpAssetToFile; 78 private bool m_dumpAssetToFile;
79 private string m_name = String.Empty; 79 private string m_name = String.Empty;
80 private bool m_storeLocal; 80// private bool m_storeLocal;
81 private uint nextPerm = 0; 81 private uint nextPerm = 0;
82 private IClientAPI ourClient; 82 private IClientAPI ourClient;
83 83
@@ -197,7 +197,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
197 m_asset.Local = storeLocal; 197 m_asset.Local = storeLocal;
198 m_asset.Temporary = tempFile; 198 m_asset.Temporary = tempFile;
199 199
200 m_storeLocal = storeLocal; 200// m_storeLocal = storeLocal;
201 201
202 if (m_asset.Data.Length > 2) 202 if (m_asset.Data.Length > 2)
203 { 203 {
@@ -249,10 +249,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
249 249
250 m_transactions.RemoveXferUploader(m_transactionID); 250 m_transactions.RemoveXferUploader(m_transactionID);
251 } 251 }
252 else if (m_storeLocal) 252// else if (m_storeLocal)
253 { 253// {
254 m_Scene.AssetService.Store(m_asset); 254// m_Scene.AssetService.Store(m_asset);
255 } 255// }
256 } 256 }
257 257
258 m_log.DebugFormat( 258 m_log.DebugFormat(