diff options
author | MW | 2008-02-11 20:54:46 +0000 |
---|---|---|
committer | MW | 2008-02-11 20:54:46 +0000 |
commit | 7bbb9a08cb3c989f64174451f4af6329f13009a7 (patch) | |
tree | c28a6463f55fbd442c802e336479bcf80e07d5fc /OpenSim/Framework/Communications | |
parent | Documenting and minor tweaks (diff) | |
download | opensim-SC_OLD-7bbb9a08cb3c989f64174451f4af6329f13009a7.zip opensim-SC_OLD-7bbb9a08cb3c989f64174451f4af6329f13009a7.tar.gz opensim-SC_OLD-7bbb9a08cb3c989f64174451f4af6329f13009a7.tar.bz2 opensim-SC_OLD-7bbb9a08cb3c989f64174451f4af6329f13009a7.tar.xz |
Re-enabled Inventory creation of body parts
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs | 7 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetTransactions.cs | 6 |
2 files changed, 9 insertions, 4 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 | } |
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 | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | // Remove the uploader once the uploader is complete | 108 | // Remove the uploader once the uploader is complete |
109 | //[don't think we can be sure a upload has finished from here, uploads are multi part things] | ||
110 | // [or maybe we can if we do more checking like data lenght checks] | ||
109 | if (uploaderFound != null) | 111 | if (uploaderFound != null) |
110 | { | 112 | { |
111 | // m_log.Info( | 113 | // m_log.Info( |
@@ -113,7 +115,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
113 | // "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", | 115 | // "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", |
114 | // xferID, uploaderFound.TransactionID)); | 116 | // xferID, uploaderFound.TransactionID)); |
115 | 117 | ||
116 | XferUploaders.Remove(uploaderFound.TransactionID); | 118 | // XferUploaders.Remove(uploaderFound.TransactionID); |
117 | 119 | ||
118 | //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count); | 120 | //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count); |
119 | } | 121 | } |