diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs index 15d6f7f..0a6785c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |||
| @@ -98,7 +98,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | /// <summary> | 100 | /// <summary> |
| 101 | /// Sends packets for this texture to a client until packetsToSend is | 101 | /// Sends packets for this texture to a client until packetsToSend is |
| 102 | /// hit or the transfer completes | 102 | /// hit or the transfer completes |
| 103 | /// </summary> | 103 | /// </summary> |
| 104 | /// <param name="client">Reference to the client that the packets are destined for</param> | 104 | /// <param name="client">Reference to the client that the packets are destined for</param> |
| @@ -198,7 +198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 198 | m_currentPacket = m_stopPacket; | 198 | m_currentPacket = m_stopPacket; |
| 199 | return; | 199 | return; |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | if (DiscardLevel >= 0 || m_stopPacket == 0) | 202 | if (DiscardLevel >= 0 || m_stopPacket == 0) |
| 203 | { | 203 | { |
| 204 | // This shouldn't happen, but if it does, we really can't proceed | 204 | // This shouldn't happen, but if it does, we really can't proceed |