From ff7da2082d4d44b34c3ef312d5ec5e88c94931e1 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 30 Oct 2010 02:25:25 +0100
Subject: This commit fixes all the appearance related null refs. Still can't
 log in, client displays a blank error box.

---
 OpenSim/Framework/AvatarAppearance.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/AvatarAppearance.cs')

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index ee60622..1e003f7 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -111,6 +111,10 @@ namespace OpenSim.Framework
             SetDefaultParams();
             SetHeight();
             
+            m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
+            for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ )
+                m_wearables[i] = new AvatarWearable();
+
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
         }
         
@@ -172,10 +176,11 @@ namespace OpenSim.Framework
             m_serial = appearance.Serial;
             m_owner = appearance.Owner;
 
-            m_wearables = null;
+            m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
+            for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ )
+                m_wearables[i] = new AvatarWearable();
             if (appearance.Wearables != null)
             {
-                m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES]; //should be 15 of these
                 for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                     SetWearable(i,appearance.Wearables[i]);
             }
-- 
cgit v1.1