From aae29c0ee2467a7978df53dba6f8461d1f566c59 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Jul 2013 20:22:13 -0700
Subject: Further tweaks on TPs: not sending the callback URL and instead
 waiting 15sec before closing the agent. This seems to be working fairly well.
 The viewer seems to have an 8 sec delay between UseCircuitCode and
 CompleteMovement. Also added back the position on UpdateAgent, because it's
 needed for TPing between neighboring regions.

---
 .../CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
index 172bea1..516ad40 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 
         public void OnConnectionClose(IClientAPI client)
         {
-            if (!client.SceneAgent.IsChildAgent)
+            if (client != null && client.SceneAgent != null && !client.SceneAgent.IsChildAgent)
             {
 //                m_log.DebugFormat("[PRESENCE DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName);
                 m_PresenceService.LogoutAgent(client.SessionId);
-- 
cgit v1.1