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

* Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet

Browse Source 
* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line
This commit is contained in:
John Hurliman
2009-10-06 02:38:00 -07:00
parent 7ddb6fbced
commit e7c877407f
17 changed files with 1280 additions and 2244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
View File

@@ -76,27 +76,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
if (m_currentPacket <= m_stopPacket)
{
bool SendMore = true;
int count = 0;
bool sendMore = true;
if (!m_sentInfo || (m_currentPacket == 0))
{
if (SendFirstPacket(client))
{
SendMore = false;
}
sendMore = !SendFirstPacket(client);
m_sentInfo = true;
m_currentPacket++;
++m_currentPacket;
++count;
}
if (m_currentPacket < 2)
{
m_currentPacket = 2;
}
int count = 0;
while (SendMore && count < maxpack && m_currentPacket <= m_stopPacket)
while (sendMore && count < maxpack && m_currentPacket <= m_stopPacket)
{
count++;
SendMore = SendPacket(client);
m_currentPacket++;
sendMore = SendPacket(client);
++m_currentPacket;
++count;
}
if (m_currentPacket > m_stopPacket)
@@ -196,15 +196,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_currentPacket = StartPacket;
}
if (m_imageManager != null && m_imageManager.Client != null)
{
if (m_imageManager.Client.IsThrottleEmpty(ThrottleOutPacketType.Texture))
{
//m_log.Debug("No textures queued, sending one packet to kickstart it");
SendPacket(m_imageManager.Client);
}
}
}
}
}