ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed a bug where clients were being added to ClientManager twice

Browse Source 
* Changed the ClientManager interface to reduce potential errors with duplicate or mismatched keys
* Added IClientAPI.RemoteEndPoint, which can (hopefully) eventually replace IClientAPI.CircuitCode
* Changed the order of operations during client shutdown
This commit is contained in:
John Hurliman
2009-10-13 16:53:19 -07:00
parent 23a334b9f5
commit 395a8680c3
5 changed files with 62 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
View File

@@ -167,39 +167,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
J2KImage imagereq;
int numCollected = 0;
//lock (m_syncRoot)
//{
m_lastloopprocessed = DateTime.Now.Ticks;
m_lastloopprocessed = DateTime.Now.Ticks;
// This can happen during Close()
if (m_client == null)
return false;
while ((imagereq = GetHighestPriorityImage()) != null)
// This can happen during Close()
if (m_client == null)
return false;
while ((imagereq = GetHighestPriorityImage()) != null)
{
if (imagereq.IsDecoded == true)
{
if (imagereq.IsDecoded == true)
++numCollected;
if (imagereq.SendPackets(m_client, maxpack))
{
++numCollected;
if (imagereq.SendPackets(m_client, maxpack))
{
// Send complete. Destroy any knowledge of this transfer
RemoveImageFromQueue(imagereq);
}
// Send complete. Destroy any knowledge of this transfer
RemoveImageFromQueue(imagereq);
}
if (numCollected == count)
break;
}
//}
if (numCollected == count)
break;
}
return m_priorityQueue.Count > 0;
}
//Faux destructor
/// <summary>
/// Faux destructor
/// </summary>
public void Close()
{
m_shuttingdown = true;
m_priorityQueue = null;
m_j2kDecodeModule = null;
m_assetCache = null;
m_client = null;