aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs7
1 files changed, 4 insertions, 3 deletions
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
1453 public void SendInitialData() 1453 public void SendInitialData()
1454 { 1454 {
1455 // justincc - very temporary fix for the fact that m_apperance appears to be null at this point in grid mode 1455 // justincc - very temporary fix for the fact that m_apperance appears to be null at this point in grid mode
1456 if (null == m_appearance) 1456 LLObject.TextureEntry texture = AvatarAppearance.GetDefaultTexture();
1457 m_appearance = new AvatarAppearance(); 1457 if (null != m_appearance)
1458 texture = m_appearance.Texture;
1458 1459
1459 m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, 1460 m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId,
1460 m_pos, m_appearance.Texture.ToBytes(), m_parentID); 1461 m_pos, texture.ToBytes(), m_parentID);
1461 1462
1462 if (!m_isChildAgent) 1463 if (!m_isChildAgent)
1463 { 1464 {