diff options
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 0c0cfd5..e1d0bbe 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -28,8 +28,10 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | ||
31 | using System.Runtime.Serialization; | 32 | using System.Runtime.Serialization; |
32 | using System.Security.Permissions; | 33 | using System.Security.Permissions; |
34 | using log4net; | ||
33 | using OpenMetaverse; | 35 | using OpenMetaverse; |
34 | using OpenMetaverse.Packets; | 36 | using OpenMetaverse.Packets; |
35 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
@@ -39,6 +41,9 @@ namespace OpenSim.Framework | |||
39 | [Serializable] | 41 | [Serializable] |
40 | public class AvatarAppearance : ISerializable | 42 | public class AvatarAppearance : ISerializable |
41 | { | 43 | { |
44 | // private static readonly ILog m_log | ||
45 | // = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | |||
42 | // these are guessed at by the list here - | 47 | // these are guessed at by the list here - |
43 | // http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll | 48 | // http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll |
44 | // correct them over time for when were are wrong. | 49 | // correct them over time for when were are wrong. |
@@ -258,7 +263,7 @@ namespace OpenSim.Framework | |||
258 | } | 263 | } |
259 | 264 | ||
260 | /// <summary> | 265 | /// <summary> |
261 | /// | 266 | /// Set up appearance textures and avatar parameters, including a height calculation |
262 | /// </summary> | 267 | /// </summary> |
263 | /// <param name="texture"></param> | 268 | /// <param name="texture"></param> |
264 | /// <param name="visualParam"></param> | 269 | /// <param name="visualParam"></param> |
@@ -266,7 +271,15 @@ namespace OpenSim.Framework | |||
266 | { | 271 | { |
267 | Primitive.TextureEntry textureEnt = new Primitive.TextureEntry(texture, 0, texture.Length); | 272 | Primitive.TextureEntry textureEnt = new Primitive.TextureEntry(texture, 0, texture.Length); |
268 | m_texture = textureEnt; | 273 | m_texture = textureEnt; |
269 | 274 | ||
275 | // m_log.DebugFormat("[APPEARANCE]: Setting an avatar appearance with {0} faces", m_texture.FaceTextures.Length); | ||
276 | // for (int i = 0; i < m_texture.FaceTextures.Length; i++) | ||
277 | // { | ||
278 | // Primitive.TextureEntryFace face = m_texture.FaceTextures[i]; | ||
279 | // String textureIdString = (face != null ? face.TextureID.ToString() : "none"); | ||
280 | // m_log.DebugFormat("[APPEARANCE]: Texture {0} is {1}", i, textureIdString); | ||
281 | // } | ||
282 | |||
270 | m_visualparams = visualParam.ToArray(); | 283 | m_visualparams = visualParam.ToArray(); |
271 | 284 | ||
272 | // Teravus : Nifty AV Height Getting Maaaaagical formula. Oh how we love turning 0-255 into meters. | 285 | // Teravus : Nifty AV Height Getting Maaaaagical formula. Oh how we love turning 0-255 into meters. |
@@ -297,10 +310,10 @@ namespace OpenSim.Framework | |||
297 | public override String ToString() | 310 | public override String ToString() |
298 | { | 311 | { |
299 | String s = "[Wearables] =>"; | 312 | String s = "[Wearables] =>"; |
300 | s += "Body Item: " + BodyItem.ToString() + ";"; | 313 | s += " Body Item: " + BodyItem.ToString() + ";"; |
301 | s += "Skin Item: " + SkinItem.ToString() + ";"; | 314 | s += " Skin Item: " + SkinItem.ToString() + ";"; |
302 | s += "Shirt Item: " + ShirtItem.ToString() + ";"; | 315 | s += " Shirt Item: " + ShirtItem.ToString() + ";"; |
303 | s += "Pants Item: " + PantsItem.ToString() + ";"; | 316 | s += " Pants Item: " + PantsItem.ToString() + ";"; |
304 | return s; | 317 | return s; |
305 | } | 318 | } |
306 | 319 | ||