From 473b667f3b1d6c72d57151982e3790a8498b2e4f Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Sat, 24 Jul 2010 13:56:14 +0000 Subject: [PATCH] Merge additional check in LIBOMV-857 fix. git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/branches/0.8-devel@3387 52acb1d6-8a22-11de-b505-999d5b087335 --- OpenMetaverse/AgentManagerMovement.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenMetaverse/AgentManagerMovement.cs b/OpenMetaverse/AgentManagerMovement.cs index 24226b094..8a4447c9d 100644 --- a/OpenMetaverse/AgentManagerMovement.cs +++ b/OpenMetaverse/AgentManagerMovement.cs @@ -590,7 +590,7 @@ public void SendUpdate(bool reliable, Simulator simulator) { // Since version 1.40.4 of the Linden simulator, sending this update // causes corruption of the agent position in the simulator - if (!simulator.HandshakeComplete) + if (simulator != null && (!simulator.HandshakeComplete)) return; Vector3 origin = Camera.Position; @@ -675,7 +675,7 @@ public void SendManualUpdate(AgentManager.ControlFlags controlFlags, Vector3 pos { // Since version 1.40.4 of the Linden simulator, sending this update // causes corruption of the agent position in the simulator - if (!Client.Network.CurrentSim.HandshakeComplete) + if (Client.Network.CurrentSim != null && (!Client.Network.CurrentSim.HandshakeComplete)) return; AgentUpdatePacket update = new AgentUpdatePacket();