aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-09-25 23:12:28 +0100
committerMelanie2012-09-27 15:27:56 +0100
commit7d6ac75f872998ef175b3887391db0610fab1464 (patch)
treef810c6957309cb7dc7eb2de34f4c0a52c8375279 /OpenSim
parentFormat OpenSim.ini.example (diff)
downloadopensim-SC-7d6ac75f872998ef175b3887391db0610fab1464.zip
opensim-SC-7d6ac75f872998ef175b3887391db0610fab1464.tar.gz
opensim-SC-7d6ac75f872998ef175b3887391db0610fab1464.tar.bz2
opensim-SC-7d6ac75f872998ef175b3887391db0610fab1464.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 '')
-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 a852767..9a1dd4d 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
85 private string m_description = String.Empty; 85 private string m_description = String.Empty;
86 private bool m_dumpAssetToFile; 86 private bool m_dumpAssetToFile;
87 private string m_name = String.Empty; 87 private string m_name = String.Empty;
88 private bool m_storeLocal; 88// private bool m_storeLocal;
89 private uint nextPerm = 0; 89 private uint nextPerm = 0;
90 private IClientAPI ourClient; 90 private IClientAPI ourClient;
91 91
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
206 m_asset.Local = storeLocal; 206 m_asset.Local = storeLocal;
207 m_asset.Temporary = tempFile; 207 m_asset.Temporary = tempFile;
208 208
209 m_storeLocal = storeLocal; 209// m_storeLocal = storeLocal;
210 210
211 if (m_asset.Data.Length > 2) 211 if (m_asset.Data.Length > 2)
212 { 212 {
@@ -258,10 +258,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
258 258
259 m_transactions.RemoveXferUploader(m_transactionID); 259 m_transactions.RemoveXferUploader(m_transactionID);
260 } 260 }
261 else if (m_storeLocal) 261// else if (m_storeLocal)
262 { 262// {
263 m_Scene.AssetService.Store(m_asset); 263// m_Scene.AssetService.Store(m_asset);
264 } 264// }
265 } 265 }
266 266
267 m_log.DebugFormat( 267 m_log.DebugFormat(