Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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.
  • Loading branch information...
commit b96a53962b86083476b78498278868ce8152ddd8 1 parent eb5bec9
Justin Clark-Casey authored September 25, 2012
12  OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -77,7 +77,7 @@ private enum UploadState
77 77
         private string m_description = String.Empty;
78 78
         private bool m_dumpAssetToFile;
79 79
         private string m_name = String.Empty;
80  
-        private bool m_storeLocal;
  80
+//        private bool m_storeLocal;
81 81
         private uint nextPerm = 0;
82 82
         private IClientAPI ourClient;
83 83
 
@@ -197,7 +197,7 @@ public bool HandleXferPacket(ulong xferID, uint packetID, byte[] data)
197 197
             m_asset.Local = storeLocal;
198 198
             m_asset.Temporary = tempFile;
199 199
 
200  
-            m_storeLocal = storeLocal;
  200
+//            m_storeLocal = storeLocal;
201 201
 
202 202
             if (m_asset.Data.Length > 2)
203 203
             {
@@ -249,10 +249,10 @@ protected void SendCompleteMessage()
249 249
 
250 250
                     m_transactions.RemoveXferUploader(m_transactionID);
251 251
                 }
252  
-                else if (m_storeLocal)
253  
-                {
254  
-                    m_Scene.AssetService.Store(m_asset);
255  
-                }
  252
+//                else if (m_storeLocal)
  253
+//                {
  254
+//                    m_Scene.AssetService.Store(m_asset);
  255
+//                }
256 256
             }
257 257
 
258 258
             m_log.DebugFormat(

0 notes on commit b96a539

Please sign in to comment.
Something went wrong with that request. Please try again.