aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2016-11-18 03:40:34 +0000
committerUbitUmarov2016-11-18 03:40:34 +0000
commit70eb37433d4cc7512ebe6cac1d7c288c9b1db06f (patch)
treed0bb219311845926b5c7bb2e7c82e691e3f2222b /OpenSim/Region
parent restore higher resolution clock on udpserver and lower uaeraccouts caching time (diff)
downloadopensim-SC-70eb37433d4cc7512ebe6cac1d7c288c9b1db06f.zip
opensim-SC-70eb37433d4cc7512ebe6cac1d7c288c9b1db06f.tar.gz
opensim-SC-70eb37433d4cc7512ebe6cac1d7c288c9b1db06f.tar.bz2
opensim-SC-70eb37433d4cc7512ebe6cac1d7c288c9b1db06f.tar.xz
avoid a null ref. (needs better way)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 3793712..8ba26e8 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4371,6 +4371,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4371 4371
4372 ushort timeDilation; 4372 ushort timeDilation;
4373 4373
4374 if(m_scene == null)
4375 return;
4376
4374 timeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f); 4377 timeDilation = Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
4375 4378
4376 if (terseAgentUpdateBlocks.Count > 0) 4379 if (terseAgentUpdateBlocks.Count > 0)
@@ -4632,6 +4635,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4632 4635
4633 void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories) 4636 void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories)
4634 { 4637 {
4638 if(m_scene == null)
4639 return;
4640
4635 if ((categories & ThrottleOutPacketTypeFlags.Task) != 0) 4641 if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
4636 { 4642 {
4637 int maxUpdateBytes = m_udpClient.GetCatBytesCanSend(ThrottleOutPacketType.Task, 30); 4643 int maxUpdateBytes = m_udpClient.GetCatBytesCanSend(ThrottleOutPacketType.Task, 30);