From 7bbb9a08cb3c989f64174451f4af6329f13009a7 Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 11 Feb 2008 20:54:46 +0000
Subject: Re-enabled Inventory creation of body parts

---
 OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs | 7 +++++--
 OpenSim/Framework/Communications/Cache/AssetTransactions.cs       | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
index e78e209..e4808a1 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
@@ -99,15 +99,18 @@ namespace OpenSim.Framework.Communications.Cache
                 if (uploader != null)
                 {
                     // Upload has already compelted uploading...
+                    
                     if (uploader.Initialise(remoteClient, assetID, transaction, type, data, storeLocal, tempFile))
                     {
-                        lock (transactions.XferUploaders)
+                        //[commenting out as this removal breaks uploads]
+                       /*lock (transactions.XferUploaders)
                         {
+                          
                             // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary
                             transactions.XferUploaders.Remove(uploader.TransactionID);
                             
                             //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count);                        
-                        }
+                        }*/
                     }
                 }
             }
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index da10f85..996e5ba 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -105,7 +105,9 @@ namespace OpenSim.Framework.Communications.Cache
                     }
                 }
                 
-                // Remove the uploader once the uploader is complete
+                // Remove the uploader once the uploader is complete 
+                //[don't think we can be sure a upload has finished from here, uploads are multi part things]
+                // [or maybe we can if we do more checking like data lenght checks]
                 if (uploaderFound != null)
                 {                
 //                    m_log.Info(
@@ -113,7 +115,7 @@ namespace OpenSim.Framework.Communications.Cache
 //                            "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", 
 //                            xferID, uploaderFound.TransactionID));                
                     
-                    XferUploaders.Remove(uploaderFound.TransactionID);
+   //                 XferUploaders.Remove(uploaderFound.TransactionID);
                     
                     //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count);                
                 }            
-- 
cgit v1.1