diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs index 19ad0b4..2f1face 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | |||
@@ -76,27 +76,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
76 | { | 76 | { |
77 | if (m_currentPacket <= m_stopPacket) | 77 | if (m_currentPacket <= m_stopPacket) |
78 | { | 78 | { |
79 | bool SendMore = true; | 79 | int count = 0; |
80 | bool sendMore = true; | ||
81 | |||
80 | if (!m_sentInfo || (m_currentPacket == 0)) | 82 | if (!m_sentInfo || (m_currentPacket == 0)) |
81 | { | 83 | { |
82 | if (SendFirstPacket(client)) | 84 | sendMore = !SendFirstPacket(client); |
83 | { | 85 | |
84 | SendMore = false; | ||
85 | } | ||
86 | m_sentInfo = true; | 86 | m_sentInfo = true; |
87 | m_currentPacket++; | 87 | ++m_currentPacket; |
88 | ++count; | ||
88 | } | 89 | } |
89 | if (m_currentPacket < 2) | 90 | if (m_currentPacket < 2) |
90 | { | 91 | { |
91 | m_currentPacket = 2; | 92 | m_currentPacket = 2; |
92 | } | 93 | } |
93 | 94 | ||
94 | int count = 0; | 95 | while (sendMore && count < maxpack && m_currentPacket <= m_stopPacket) |
95 | while (SendMore && count < maxpack && m_currentPacket <= m_stopPacket) | ||
96 | { | 96 | { |
97 | count++; | 97 | sendMore = SendPacket(client); |
98 | SendMore = SendPacket(client); | 98 | ++m_currentPacket; |
99 | m_currentPacket++; | 99 | ++count; |
100 | } | 100 | } |
101 | 101 | ||
102 | if (m_currentPacket > m_stopPacket) | 102 | if (m_currentPacket > m_stopPacket) |
@@ -196,13 +196,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
196 | 196 | ||
197 | m_currentPacket = StartPacket; | 197 | m_currentPacket = StartPacket; |
198 | } | 198 | } |
199 | |||
200 | if ((m_imageManager != null) && (m_imageManager.Client != null) && (m_imageManager.Client.PacketHandler != null)) | ||
201 | if (m_imageManager.Client.PacketHandler.GetQueueCount(ThrottleOutPacketType.Texture) == 0) | ||
202 | { | ||
203 | //m_log.Debug("No textures queued, sending one packet to kickstart it"); | ||
204 | SendPacket(m_imageManager.Client); | ||
205 | } | ||
206 | } | 199 | } |
207 | } | 200 | } |
208 | } | 201 | } |