diff options
| author | Melanie | 2009-10-08 08:07:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-08 08:07:38 +0100 |
| commit | fe679be9e76190ac0dc8892469787e63a7a48b5c (patch) | |
| tree | 220ef33da75f09b3e7ef3684c5ed7367e175691e /OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | |
| parent | store owner_uuid in the region table (diff) | |
| parent | One last attempt at tunning the locking/no locking behaviour. The previous on... (diff) | |
| download | opensim-SC-fe679be9e76190ac0dc8892469787e63a7a48b5c.zip opensim-SC-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.gz opensim-SC-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.bz2 opensim-SC-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.xz | |
Merge branch 'htb-throttle'
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs index cc290ed..343f537 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | |||
| @@ -172,7 +172,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 172 | m_lastloopprocessed = DateTime.Now.Ticks; | 172 | m_lastloopprocessed = DateTime.Now.Ticks; |
| 173 | 173 | ||
| 174 | // This can happen during Close() | 174 | // This can happen during Close() |
| 175 | if (m_client == null || m_client.PacketHandler == null || m_client.PacketHandler.PacketQueue == null) | 175 | if (m_client == null) |
| 176 | return false; | 176 | return false; |
| 177 | 177 | ||
| 178 | while ((imagereq = GetHighestPriorityImage()) != null) | 178 | while ((imagereq = GetHighestPriorityImage()) != null) |