diff options
| author | Tom Grimshaw | 2010-06-02 07:59:18 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-02 07:59:18 -0700 |
| commit | 293f775fa56c8bcb3986373e004f54e549168be6 (patch) | |
| tree | e4cf62034f2979e04c746b994830871749116e97 /OpenSim | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| download | opensim-SC_OLD-293f775fa56c8bcb3986373e004f54e549168be6.zip opensim-SC_OLD-293f775fa56c8bcb3986373e004f54e549168be6.tar.gz opensim-SC_OLD-293f775fa56c8bcb3986373e004f54e549168be6.tar.bz2 opensim-SC_OLD-293f775fa56c8bcb3986373e004f54e549168be6.tar.xz | |
Always provide at least 2 packets of a texture (if the texture is larger than 1 packet). This fixes compatibility with the newer (broken) SnowGlobe and Emerald viewer(s), but also matches the behaviour of SL.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs index 9869a99..5c17b0e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | |||
| @@ -202,6 +202,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 202 | m_stopPacket = TexturePacketCount(); | 202 | m_stopPacket = TexturePacketCount(); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way) | ||
| 206 | if (m_stopPacket == 1 && Layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++; | ||
| 207 | |||
| 205 | m_currentPacket = StartPacket; | 208 | m_currentPacket = StartPacket; |
| 206 | } | 209 | } |
| 207 | } | 210 | } |