diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index b37fd54..fe28ba3 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -348,7 +348,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
348 | protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>(); | 348 | protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>(); |
349 | protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers | 349 | protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers |
350 | protected Scene m_scene; | 350 | protected Scene m_scene; |
351 | protected LLImageManager m_imageManager; | 351 | private LLImageManager m_imageManager; |
352 | protected string m_firstName; | 352 | protected string m_firstName; |
353 | protected string m_lastName; | 353 | protected string m_lastName; |
354 | protected Thread m_clientThread; | 354 | protected Thread m_clientThread; |
@@ -499,8 +499,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
499 | IsActive = false; | 499 | IsActive = false; |
500 | 500 | ||
501 | // Shutdown the image manager | 501 | // Shutdown the image manager |
502 | if (m_imageManager != null) | 502 | m_imageManager.Close(); |
503 | m_imageManager.Close(); | ||
504 | 503 | ||
505 | // Fire the callback for this connection closing | 504 | // Fire the callback for this connection closing |
506 | if (OnConnectionClosed != null) | 505 | if (OnConnectionClosed != null) |
@@ -3940,14 +3939,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3940 | } | 3939 | } |
3941 | 3940 | ||
3942 | if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0) | 3941 | if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0) |
3943 | { | ||
3944 | ProcessTextureRequests(); | ||
3945 | } | ||
3946 | } | ||
3947 | |||
3948 | void ProcessTextureRequests() | ||
3949 | { | ||
3950 | if (m_imageManager != null) | ||
3951 | m_imageManager.ProcessImageQueue(m_udpServer.TextureSendLimit); | 3942 | m_imageManager.ProcessImageQueue(m_udpServer.TextureSendLimit); |
3952 | } | 3943 | } |
3953 | 3944 | ||
@@ -7479,12 +7470,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7479 | if ((ImageType)block.Type == ImageType.Baked) | 7470 | if ((ImageType)block.Type == ImageType.Baked) |
7480 | args.Priority *= 2.0f; | 7471 | args.Priority *= 2.0f; |
7481 | 7472 | ||
7482 | // in the end, we null this, so we have to check if it's null | 7473 | m_imageManager.EnqueueReq(args); |
7483 | if (m_imageManager != null) | ||
7484 | { | ||
7485 | m_imageManager.EnqueueReq(args); | ||
7486 | } | ||
7487 | } | 7474 | } |
7475 | |||
7488 | return true; | 7476 | return true; |
7489 | } | 7477 | } |
7490 | 7478 | ||