aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AvatarAppearance.cs
diff options
context:
space:
mode:
authorMic Bowman2010-11-29 16:24:16 -0800
committerMelanie2010-11-30 16:20:43 +0100
commitab2adaf3418e5a64c7d94305d45489310eaa2ab0 (patch)
tree7f80d7795fdc6c4dfb0911ed87af8d8d0131b275 /OpenSim/Framework/AvatarAppearance.cs
parentPrevent the restart module from barfing if it's not configured (diff)
downloadopensim-SC_OLD-ab2adaf3418e5a64c7d94305d45489310eaa2ab0.zip
opensim-SC_OLD-ab2adaf3418e5a64c7d94305d45489310eaa2ab0.tar.gz
opensim-SC_OLD-ab2adaf3418e5a64c7d94305d45489310eaa2ab0.tar.bz2
opensim-SC_OLD-ab2adaf3418e5a64c7d94305d45489310eaa2ab0.tar.xz
Various bug fixes for appearance handling
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs23
1 files changed, 18 insertions, 5 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 2906af8..aaf441c 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -238,11 +238,27 @@ namespace OpenSim.Framework
238// } 238// }
239 } 239 }
240 240
241 /// <summary>
242 /// Invalidate all of the baked textures in the appearance, useful
243 /// if you know that none are valid
244 /// </summary>
245 public virtual void ResetBakedTextures()
246 {
247 SetDefaultTexture();
248
249 //for (int i = 0; i < BAKE_INDICES.Length; i++)
250 // {
251 // int idx = BAKE_INDICES[i];
252 // m_texture.FaceTextures[idx].TextureID = UUID.Zero;
253 // }
254 }
255
241 protected virtual void SetDefaultTexture() 256 protected virtual void SetDefaultTexture()
242 { 257 {
243 m_texture = new Primitive.TextureEntry(new UUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97")); 258 m_texture = new Primitive.TextureEntry(new UUID("C228D1CF-4B5D-4BA8-84F4-899A0796AA97"));
244 for (uint i = 0; i < TEXTURE_COUNT; i++) 259
245 m_texture.CreateFace(i).TextureID = new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE); 260 // for (uint i = 0; i < TEXTURE_COUNT; i++)
261 // m_texture.CreateFace(i).TextureID = new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE);
246 } 262 }
247 263
248 /// <summary> 264 /// <summary>
@@ -274,9 +290,6 @@ namespace OpenSim.Framework
274 } 290 }
275 291
276 changed = true; 292 changed = true;
277
278// if (newface != null)
279// m_log.WarnFormat("[AVATAR APPEARANCE]: index {0}, new texture id {1}",i,newface.TextureID);
280 } 293 }
281 294
282 m_texture = textureEntry; 295 m_texture = textureEntry;