From b96a53962b86083476b78498278868ce8152ddd8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 25 Sep 2012 23:12:28 +0100
Subject: 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.
---
 .../CoreModules/Agent/AssetTransaction/AssetXferUploader.cs  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim')

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
         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;
 
@@ -197,7 +197,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)
             {
@@ -249,10 +249,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(
-- 
cgit v1.1