OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-enabled Inventory creation of body parts

ThreadPoolClientBranch
MW 2008-02-11 20:54:46 +00:00
parent c80c6e9774
commit 7bbb9a08cb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
View File

@ -99,15 +99,18 @@ namespace OpenSim.Framework.Communications.Cache
if (uploader != null) if (uploader != null)
{ {
// Upload has already compelted uploading... // Upload has already compelted uploading...
if (uploader.Initialise(remoteClient, assetID, transaction, type, data, storeLocal, tempFile)) 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 // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary
transactions.XferUploaders.Remove(uploader.TransactionID); transactions.XferUploaders.Remove(uploader.TransactionID);
//m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count); //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count);
} }*/
} }
} }
} }

4
OpenSim/Framework/Communications/Cache/AssetTransactions.cs
View File

@ -106,6 +106,8 @@ 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) if (uploaderFound != null)
{ {
// m_log.Info( // m_log.Info(
@ -113,7 +115,7 @@ namespace OpenSim.Framework.Communications.Cache
// "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}", // "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}",
// xferID, uploaderFound.TransactionID)); // xferID, uploaderFound.TransactionID));
XferUploaders.Remove(uploaderFound.TransactionID); // XferUploaders.Remove(uploaderFound.TransactionID);
//m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count); //m_log.InfoFormat("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count);
} }