mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 18:25:33 +08:00
Still chasing logout memory leak. Putting in small changes and temporary light verbosity to this end
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using libsecondlife;
|
||||
using libsecondlife.Packets;
|
||||
@@ -70,7 +71,9 @@ namespace OpenSim.Framework
|
||||
|
||||
public void Remove(uint id)
|
||||
{
|
||||
//m_log.Info(String.Format("[CLIENT]: Removing client with code {0}, current count {1}", id, m_clients.Count));
|
||||
m_clients.Remove(id);
|
||||
m_log.Info(String.Format("[CLIENT]: Removed client with code {0}, new client count {1}", id, m_clients.Count));
|
||||
}
|
||||
|
||||
public void Add(uint id, IClientAPI client)
|
||||
|
||||
@@ -103,12 +103,22 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get an uploaded asset. If the data is successfully retrieved, the transaction will be removed.
|
||||
/// </summary>
|
||||
/// <param name="transactionID"></param>
|
||||
/// <returns>The asset if the upload has completed, null if it has not.</returns>
|
||||
public AssetBase GetTransactionAsset(LLUUID transactionID)
|
||||
{
|
||||
if (XferUploaders.ContainsKey(transactionID))
|
||||
{
|
||||
return XferUploaders[transactionID].GetAssetData();
|
||||
AssetXferUploader uploader = XferUploaders[transactionID];
|
||||
AssetBase asset = uploader.GetAssetData();
|
||||
XferUploaders.Remove(transactionID);
|
||||
|
||||
return asset;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -237,6 +247,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
SaveAssetToFile(filename, Asset.Data);
|
||||
}
|
||||
}
|
||||
|
||||
///Left this in and commented in case there are unforseen issues
|
||||
//private void SaveAssetToFile(string filename, byte[] data)
|
||||
//{
|
||||
@@ -311,10 +322,6 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateInventoryItem(LLUUID itemID)
|
||||
{
|
||||
}
|
||||
|
||||
public AssetBase GetAssetData()
|
||||
{
|
||||
if (m_finished)
|
||||
|
||||
Reference in New Issue
Block a user