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

Add copyright header. Formatting cleanup. Ignore some generated files.

Browse Source
This commit is contained in:
Jeff Ames
2009-05-05 09:59:15 +00:00
parent 6ae88d129a
commit 8ea12ad6c0
9 changed files with 102 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,13 +36,13 @@ using System.Reflection;
namespace OpenSim.Region.ClientStack.LindenUDP
{
/// <summary>
/// We use this class to store image data and associated request data and attributes
/// </summary>
/// <summary>
/// We use this class to store image data and associated request data and attributes
/// </summary>
public class J2KImage
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public double m_designatedPriorityKey;
public double m_requestedPriority = 0.0d;
public uint m_lastSequence = 0;
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public AssetBase m_MissingSubstitute = null;
public bool m_decoded = false;
public bool m_completedSendAtCurrentDiscardLevel;
private sbyte m_discardLevel=-1;
private uint m_packetNumber;
private bool m_decoderequested = false;
@@ -135,6 +135,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
return ((bytePosition - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1;
}
public int LastPacketSize()
{
if (m_packetNumber == 1)
@@ -146,8 +147,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
lastsize = cImagePacketSize;
}
return lastsize;
}
}
public int CurrentBytePosition()
{
@@ -215,7 +215,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
complete = true;
}
}
// It's concievable that the client might request packet one
// from a one packet image, which is really packet 0,
// which would leave us with a negative imagePacketSize..
@@ -234,7 +234,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//Send the packet
client.SendImageNextPart((ushort)(m_packetNumber-1), m_requestedUUID, imageData);
}
if (complete)
{
@@ -257,7 +256,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
if (m_packetNumber <= m_stopPacket)
{
bool SendMore = true;
if (!m_sentinfo || (m_packetNumber == 0))
{
@@ -273,8 +271,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
m_packetNumber = 2;
}
int count=0;
int count = 0;
while (SendMore && count < 5 && m_packetNumber <= m_stopPacket)
{
count++;
@@ -284,13 +282,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_packetNumber > m_stopPacket)
{
return true;
}
}
}
return false;
}
@@ -343,12 +337,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
else
{
//discardLevel of -1 means just update the priority
if (m_requestedDiscardLevel != -1)
{
//Evaluate the discard level
//First, is it positive?
if (m_requestedDiscardLevel >= 0)
@@ -361,7 +352,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
m_discardLevel = m_requestedDiscardLevel;
}
//Calculate the m_stopPacket
if (Layers.Length > 0)
{
@@ -382,18 +373,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
m_packetNumber = m_requestedPacketNumber;
}
if (m_packetNumber <= m_stopPacket)
{
m_completedSendAtCurrentDiscardLevel = false;
}
}
}
}
}
}
}
}

2
OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
View File

@@ -248,7 +248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void Cancel(uint sequence)
{
while(contents.Remove(sequence))
while (contents.Remove(sequence))
;
}