diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs | 7 |
1 files changed, 5 insertions, 2 deletions
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 | |||
99 | if (uploader != null) | 99 | if (uploader != null) |
100 | { | 100 | { |
101 | // Upload has already compelted uploading... | 101 | // Upload has already compelted uploading... |
102 | |||
102 | if (uploader.Initialise(remoteClient, assetID, transaction, type, data, storeLocal, tempFile)) | 103 | if (uploader.Initialise(remoteClient, assetID, transaction, type, data, storeLocal, tempFile)) |
103 | { | 104 | { |
104 | lock (transactions.XferUploaders) | 105 | //[commenting out as this removal breaks uploads] |
106 | /*lock (transactions.XferUploaders) | ||
105 | { | 107 | { |
108 | |||
106 | // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary | 109 | // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary |
107 | transactions.XferUploaders.Remove(uploader.TransactionID); | 110 | transactions.XferUploaders.Remove(uploader.TransactionID); |
108 | 111 | ||
109 | //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count); | 112 | //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count); |
110 | } | 113 | }*/ |
111 | } | 114 | } |
112 | } | 115 | } |
113 | } | 116 | } |