From ebb0cc5dd741e4a7aa1ee97022f08841cf004769 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Fri, 16 May 2008 23:03:36 +0000
Subject: minor change to justin's previous fix that should still prevent his
 crashes

---
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index bdf1bba..7eaab40 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1453,11 +1453,12 @@ namespace OpenSim.Region.Environment.Scenes
         public void SendInitialData()
         {  
             // justincc - very temporary fix for the fact that m_apperance appears to be null at this point in grid mode
-            if (null == m_appearance)
-                m_appearance = new AvatarAppearance();
+            LLObject.TextureEntry texture = AvatarAppearance.GetDefaultTexture();
+            if (null != m_appearance)
+                texture = m_appearance.Texture;
             
             m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId,
-                                               m_pos, m_appearance.Texture.ToBytes(), m_parentID);
+                                               m_pos, texture.ToBytes(), m_parentID);
             
             if (!m_isChildAgent)
             {
-- 
cgit v1.1