From 20a9bf08f51351e1e0a9de94f184ff56cd572665 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Thu, 1 May 2008 18:04:42 +0000 Subject: * Rolled back a few changes. --- .../Region/Environment/Scenes/AvatarAppearance.cs | 123 ++++++++++----------- 1 file changed, 61 insertions(+), 62 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/AvatarAppearance.cs') diff --git a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs index 860399c..8f29507 100644 --- a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs +++ b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs @@ -37,54 +37,14 @@ namespace OpenSim.Region.Environment.Scenes [Serializable] public class AvatarAppearance : ISerializable { - protected float m_avatarHeight; protected LLUUID m_scenePresenceID; - protected LLObject.TextureEntry m_textureEntry; - protected byte[] m_visualParams; - protected AvatarWearable[] m_wearables; - - protected int m_wearablesSerial = 1; - - public AvatarAppearance() - { - } - - public AvatarAppearance(LLUUID avatarID, AvatarWearable[] wearables, byte[] visualParams) - { - m_scenePresenceID = avatarID; - m_wearablesSerial = 1; - m_wearables = wearables; - m_visualParams = visualParams; - m_textureEntry = GetDefaultTextureEntry(); - } - - protected AvatarAppearance(SerializationInfo info, StreamingContext context) - { - //System.Console.WriteLine("AvatarAppearance Deserialize BGN"); - - if (info == null) - { - throw new ArgumentNullException("info"); - } - - m_scenePresenceID = new LLUUID((Guid) info.GetValue("m_scenePresenceID", typeof (Guid))); - m_wearablesSerial = (int) info.GetValue("m_wearablesSerial", typeof (int)); - m_visualParams = (byte[]) info.GetValue("m_visualParams", typeof (byte[])); - m_wearables = (AvatarWearable[]) info.GetValue("m_wearables", typeof (AvatarWearable[])); - - byte[] m_textureEntry_work = (byte[]) info.GetValue("m_textureEntry", typeof (byte[])); - m_textureEntry = new LLObject.TextureEntry(m_textureEntry_work, 0, m_textureEntry_work.Length); - - m_avatarHeight = (float) info.GetValue("m_avatarHeight", typeof (float)); - - //System.Console.WriteLine("AvatarAppearance Deserialize END"); - } public LLUUID ScenePresenceID { get { return m_scenePresenceID; } set { m_scenePresenceID = value; } } + protected int m_wearablesSerial = 1; public int WearablesSerial { @@ -92,51 +52,50 @@ namespace OpenSim.Region.Environment.Scenes set { m_wearablesSerial = value; } } + protected byte[] m_visualParams; + public byte[] VisualParams { get { return m_visualParams; } set { m_visualParams = value; } } + protected AvatarWearable[] m_wearables; + public AvatarWearable[] Wearables { get { return m_wearables; } set { m_wearables = value; } } + protected LLObject.TextureEntry m_textureEntry; + public LLObject.TextureEntry TextureEntry { get { return m_textureEntry; } set { m_textureEntry = value; } } + protected float m_avatarHeight = 0; + public float AvatarHeight { get { return m_avatarHeight; } set { m_avatarHeight = value; } } - #region ISerializable Members - - [SecurityPermission(SecurityAction.LinkDemand, - Flags = SecurityPermissionFlag.SerializationFormatter)] - public virtual void GetObjectData( - SerializationInfo info, StreamingContext context) + public AvatarAppearance() { - if (info == null) - { - throw new ArgumentNullException("info"); - } - - info.AddValue("m_scenePresenceID", m_scenePresenceID.UUID); - info.AddValue("m_wearablesSerial", m_wearablesSerial); - info.AddValue("m_visualParams", m_visualParams); - info.AddValue("m_wearables", m_wearables); - info.AddValue("m_textureEntry", m_textureEntry.ToBytes()); - info.AddValue("m_avatarHeight", m_avatarHeight); } - #endregion + public AvatarAppearance(LLUUID avatarID, AvatarWearable[] wearables, byte[] visualParams) + { + m_scenePresenceID = avatarID; + m_wearablesSerial = 1; + m_wearables = wearables; + m_visualParams = visualParams; + m_textureEntry = GetDefaultTextureEntry(); + } /// /// @@ -156,8 +115,8 @@ namespace OpenSim.Region.Environment.Scenes // Teravus : Nifty AV Height Getting Maaaaagical formula. Oh how we love turning 0-255 into meters. // (float)m_visualParams[25] = Height // (float)m_visualParams[125] = LegLength - m_avatarHeight = (1.50856f + ((m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))) - + ((m_visualParams[125] / 255.0f) / 1.5f); + m_avatarHeight = (1.50856f + (((float) m_visualParams[25]/255.0f)*(2.525506f - 1.50856f))) + + (((float) m_visualParams[125]/255.0f)/1.5f); } /// @@ -193,5 +152,45 @@ namespace OpenSim.Region.Environment.Scenes textu.CreateFace(6).TextureID = new LLUUID("00000000-0000-1111-9999-000000000011"); return textu; } + + protected AvatarAppearance(SerializationInfo info, StreamingContext context) + { + //System.Console.WriteLine("AvatarAppearance Deserialize BGN"); + + if (info == null) + { + throw new ArgumentNullException("info"); + } + + m_scenePresenceID = new LLUUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid))); + m_wearablesSerial = (int)info.GetValue("m_wearablesSerial", typeof(int)); + m_visualParams = (byte[])info.GetValue("m_visualParams", typeof(byte[])); + m_wearables = (AvatarWearable[])info.GetValue("m_wearables", typeof(AvatarWearable[])); + + byte[] m_textureEntry_work = (byte[])info.GetValue("m_textureEntry", typeof(byte[])); + m_textureEntry = new LLObject.TextureEntry(m_textureEntry_work, 0, m_textureEntry_work.Length); + + m_avatarHeight = (float)info.GetValue("m_avatarHeight", typeof(float)); + + //System.Console.WriteLine("AvatarAppearance Deserialize END"); + } + + [SecurityPermission(SecurityAction.LinkDemand, + Flags = SecurityPermissionFlag.SerializationFormatter)] + public virtual void GetObjectData( + SerializationInfo info, StreamingContext context) + { + if (info == null) + { + throw new ArgumentNullException("info"); + } + + info.AddValue("m_scenePresenceID", m_scenePresenceID.UUID); + info.AddValue("m_wearablesSerial", m_wearablesSerial); + info.AddValue("m_visualParams", m_visualParams); + info.AddValue("m_wearables", m_wearables); + info.AddValue("m_textureEntry", m_textureEntry.ToBytes()); + info.AddValue("m_avatarHeight", m_avatarHeight); + } } -} \ No newline at end of file +} -- cgit v1.1