From 5f2b8fd5e180577880031a334dbe47b4536d804e Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Wed, 28 May 2008 02:00:43 +0000
Subject: Thank you kindly, Melanie for a patch that adds a two-stage check. It
 seems there may be a race. For me, this patch, just as it is here, fixes it.

---
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 19debea..396d752 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1403,7 +1403,13 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="remoteAvatar"></param>
         public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
         {
-            if (remoteAvatar == null || remoteAvatar.ControllingClient == null)
+            // 2 stage check is needed.
+            if (remoteAvatar == null)
+                return;
+            IClientAPI cl=remoteAvatar.ControllingClient;
+            if(cl == null)
+                return;
+            if(m_appearance.Texture == null)
                 return;
 
             remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid,
-- 
cgit v1.1