aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AvatarAppearance.cs
diff options
context:
space:
mode:
authorMelanie2010-10-30 02:25:25 +0100
committerMelanie2010-10-30 02:25:25 +0100
commitff7da2082d4d44b34c3ef312d5ec5e88c94931e1 (patch)
treeafd863eb3240e038bc10037cf4e2fc8a844fc1ea /OpenSim/Framework/AvatarAppearance.cs
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-ff7da2082d4d44b34c3ef312d5ec5e88c94931e1.zip
opensim-SC_OLD-ff7da2082d4d44b34c3ef312d5ec5e88c94931e1.tar.gz
opensim-SC_OLD-ff7da2082d4d44b34c3ef312d5ec5e88c94931e1.tar.bz2
opensim-SC_OLD-ff7da2082d4d44b34c3ef312d5ec5e88c94931e1.tar.xz
This commit fixes all the appearance related null refs. Still can't log in,
client displays a blank error box.
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs9
1 files changed, 7 insertions, 2 deletions
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
111 SetDefaultParams(); 111 SetDefaultParams();
112 SetHeight(); 112 SetHeight();
113 113
114 m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
115 for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ )
116 m_wearables[i] = new AvatarWearable();
117
114 m_attachments = new Dictionary<int, List<AvatarAttachment>>(); 118 m_attachments = new Dictionary<int, List<AvatarAttachment>>();
115 } 119 }
116 120
@@ -172,10 +176,11 @@ namespace OpenSim.Framework
172 m_serial = appearance.Serial; 176 m_serial = appearance.Serial;
173 m_owner = appearance.Owner; 177 m_owner = appearance.Owner;
174 178
175 m_wearables = null; 179 m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
180 for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ )
181 m_wearables[i] = new AvatarWearable();
176 if (appearance.Wearables != null) 182 if (appearance.Wearables != null)
177 { 183 {
178 m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES]; //should be 15 of these
179 for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) 184 for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
180 SetWearable(i,appearance.Wearables[i]); 185 SetWearable(i,appearance.Wearables[i]);
181 } 186 }