From 93bede4e6aa0838e14f39f5e641b028267d2683c Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 7 Dec 2012 21:26:58 +0000
Subject: revert the use of avatar skeleton and use avatar size provided by
viewers, since at least for now seems good enought
---
OpenSim/Framework/AvatarAppearance.cs | 47 ++--
OpenSim/Framework/AvatarSkeleton.cs | 282 ---------------------
OpenSim/Framework/IClientAPI.cs | 2 +-
.../Region/ClientStack/Linden/UDP/LLClientView.cs | 3 +-
.../Avatar/AvatarFactory/AvatarFactoryModule.cs | 31 ++-
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 +-
.../Server/IRCClientView.cs | 2 +-
OpenSim/Services/Interfaces/IAvatarService.cs | 4 +-
8 files changed, 62 insertions(+), 313 deletions(-)
delete mode 100644 OpenSim/Framework/AvatarSkeleton.cs
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 9e912de..b01b8da 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -40,6 +40,11 @@ namespace OpenSim.Framework
/// </summary>
public class AvatarAppearance
{
+ const float AVBOXAJUST = 0.2f;
+ const float AVBOXMINX = 0.2f;
+ const float AVBOXMINY = 0.3f;
+ const float AVBOXMINZ = 0.5f;
+
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// this is viewer capabilities and weared things dependent
@@ -60,9 +65,6 @@ namespace OpenSim.Framework
protected float m_avatarFeetOffset = 0;
protected float m_avatarAnimOffset = 0;
-
- private AvatarSkeleton skeleton = new AvatarSkeleton();
-
public virtual int Serial
{
get { return m_serial; }
@@ -120,7 +122,8 @@ namespace OpenSim.Framework
SetDefaultWearables();
SetDefaultTexture();
SetDefaultParams();
- SetHeight();
+// SetHeight();
+ SetSize(new Vector3(0.45f,0.6f,1.9f));
m_attachments = new Dictionary<int, List<AvatarAttachment>>();
}
@@ -129,7 +132,7 @@ namespace OpenSim.Framework
// m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance from OSDMap");
Unpack(map);
- SetHeight();
+// SetHeight(); done in Unpack
}
public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
@@ -153,7 +156,7 @@ namespace OpenSim.Framework
else
SetDefaultParams();
- SetHeight();
+// SetHeight();
m_attachments = new Dictionary<int, List<AvatarAttachment>>();
}
@@ -172,7 +175,8 @@ namespace OpenSim.Framework
SetDefaultWearables();
SetDefaultTexture();
SetDefaultParams();
- SetHeight();
+// SetHeight();
+ SetSize(new Vector3(0.45f, 0.6f, 1.9f));
m_attachments = new Dictionary<int, List<AvatarAttachment>>();
return;
@@ -201,7 +205,8 @@ namespace OpenSim.Framework
if (appearance.VisualParams != null)
m_visualparams = (byte[])appearance.VisualParams.Clone();
- m_avatarHeight = appearance.m_avatarHeight;
+// m_avatarHeight = appearance.m_avatarHeight;
+ SetSize(appearance.AvatarSize);
// Copy the attachment, force append mode since that ensures consistency
m_attachments = new Dictionary<int, List<AvatarAttachment>>();
@@ -368,8 +373,8 @@ namespace OpenSim.Framework
}
}
// Reset the height if the visual parameters actually changed
- if (changed)
- SetHeight();
+// if (changed)
+// SetHeight();
return changed;
}
@@ -399,11 +404,19 @@ namespace OpenSim.Framework
+ 0.08f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f
+ 0.076f * (float)m_visualparams[(int)VPElement.SHAPE_NECK_LENGTH] / 255.0f;
*/
-
- skeleton.ApplyVisualParameters(m_visualparams);
- m_avatarSize = skeleton.StandSize;
- m_avatarBoxSize = skeleton.StandBoxSize;
- m_avatarFeetOffset = skeleton.FeetOffset;
+ }
+
+ public void SetSize(Vector3 avSize)
+ {
+ m_avatarSize = avSize;
+ m_avatarBoxSize = avSize;
+ m_avatarBoxSize.Z += AVBOXAJUST;
+ if (m_avatarBoxSize.X < AVBOXMINX)
+ m_avatarBoxSize.X = AVBOXMINX;
+ if (m_avatarBoxSize.Y < AVBOXMINY)
+ m_avatarBoxSize.Y = AVBOXMINY;
+ if (m_avatarBoxSize.Z < AVBOXMINZ)
+ m_avatarBoxSize.Z = AVBOXMINZ;
m_avatarHeight = m_avatarSize.Z;
}
@@ -678,8 +691,9 @@ namespace OpenSim.Framework
{
if ((data != null) && (data["serial"] != null))
m_serial = data["serial"].AsInteger();
-// if ((data != null) && (data["height"] != null))
+ if ((data != null) && (data["height"] != null))
// m_avatarHeight = (float)data["height"].AsReal();
+ SetSize(new Vector3(0.45f,0.6f, (float)data["height"].AsReal()));
try
{
@@ -741,7 +755,6 @@ namespace OpenSim.Framework
// att.ItemID, att.AssetID, att.AttachPoint);
}
}
- SetHeight();
}
catch (Exception e)
{
diff --git a/OpenSim/Framework/AvatarSkeleton.cs b/OpenSim/Framework/AvatarSkeleton.cs
deleted file mode 100644
index 7a49f22..0000000
--- a/OpenSim/Framework/AvatarSkeleton.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-// Ubit 2012
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using log4net;
-using VPElement = OpenSim.Framework.AvatarAppearance.VPElement;
-
-
-
-namespace OpenSim.Framework
-{
- /// <summary>
- /// Contains the Avatar's Skeleton
- /// </summary>
- public class AvatarSkeleton
- {
- const int NBONES = 26;
- const float BOXAJUST = 0.2f;
-
- public enum Bones : int
- {
- EyeLeft,
- Eyeright,
- Skull,
- Head,
- Neck,
- CollarRight,
- CollarLeft,
- Shoulderright,
- ShoulderLeft,
- ElbowRight,
- ElbowLeft,
- WristRight,
- WristLeft,
- Chest,
- Torso,
- Pelvis,
- Hipright,
- HipLeft,
- KneeRight,
- KneeLeft,
- AnkleRight,
- AnkleLeft,
- FootRight,
- FootLeft,
- ToeRight,
- ToeLeft
- }
-
- public struct bone
- {
- public Vector3 Offset;
- public Vector3 Scale;
- public bone(float x, float y, float z)
- {
- Offset = new Vector3(x, y, z);
- Scale = new Vector3(1f, 1f, 1f);
- }
-
- public void addScale(float x, float y, float z, float factor)
- {
- Scale.X += x * factor;
- Scale.Y += y * factor;
- Scale.Y += z * factor;
- }
-
- public void addOffset(float x, float y, float z, float factor)
- {
- Offset.X += x * factor;
- Offset.Y += y * factor;
- Offset.Y += z * factor;
- }
- }
-
- private bone[] DefaultBones = new bone[]
- {
- new bone(0.098f, 0.036f, 0.079f), // EyeLeft
- new bone(0.098f, -0.036f, 0.079f), // Eyeright
- new bone(0.0f, 0.0f, 0.079f), // Skull
- new bone(0.0f, 0.0f, 0.076f), // Head
- new bone(-0.1f, 0.0f, 0.251f), // Neck
- new bone(-0.021f, -0.085f, 0.165f), // CollarRight
- new bone(-0.021f, 0.085f, 0.165f), // CollarLeft
- new bone(0.0f, -0.79f, 0.0f), // Shoulderright
- new bone(0.0f, 0.79f, 0.0f), // ShoulderLeft
- new bone(0.0f, -0.248f, 0.0f), // ElbowRight
- new bone(0.0f, 0.248f, 0.0f), // ElbowLeft
- new bone(0.0f, -0.205f, 0.0f), // WristRight
- new bone(0.0f, 0.205f, 0.0f), // WristLeft
- new bone(-0.015f, 0.000f, 0.205f), // Chest
- new bone(0.0f, 0.0f, 0.084f), // Torso
- new bone(0.0f, 0.0f, 1.067f), // Pelvis
- new bone(0.034f, -0.129f, -0.041f), // Hipright
- new bone(0.034f, 0.127f, -0.041f), // HipLeft
- new bone(-0.001f, 0.049f, -0.491f), // KneeRight
- new bone(-0.001f, -0.046f, -0.491f), // KneeLeft
- new bone(-0.029f, 0.0f, -0.468f), // AnkleRight
- new bone(-0.029f, 0.001f, -0.468f), // AnkleLeft
- new bone(0.112f, 0.0f, -0.061f), // FootRight
- new bone(0.112f, 0.0f, -0.061f), // FootLeft
- new bone(0.109f, 0.0f, 0.0f), // ToeRight
- new bone(0.109f, 0.0f, 0.0f) // ToeLeft
- };
-
- private bone[] m_bones = null;
- private byte[] m_visualParams = null;
-
- const float bytescale = 1.0f / 255.0f;
-
- private float convertVP(AvatarAppearance.VPElement vp)
- {
- return (float)m_visualParams[(int)vp] * bytescale;
- }
-
- private Vector3 m_standSize;
- private float m_feetOffset = 0f;
-
- public Vector3 StandSize
- {
- get
- {
- if (m_bones == null || m_visualParams == null)
- return new Vector3(0.45f, 0.6f, 1.9f);
- else
- return m_standSize;
- }
- }
-
- public Vector3 StandBoxSize
- {
- get
- {
- if (m_bones == null || m_visualParams == null)
- return new Vector3(0.45f, 0.6f, 1.9f + BOXAJUST);
- else
- {
- Vector3 r = m_standSize;
- r.Z += BOXAJUST;
- return r;
- }
- }
- }
-
- public float FeetOffset
- {
- get
- {
- if (m_bones == null || m_visualParams == null)
- return 0.0f;
- else
- {
- return m_feetOffset;
- }
- }
- }
-
- /// <summary>
- /// Set avatar height by a calculation based on their visual parameters.
- /// </summary>
-
- public void ApplyVisualParameters(byte[] vPs)
- {
- m_visualParams = vPs;
-
- if (m_bones == null)
- {
- m_bones = new bone[NBONES];
- for (int i = 0; i < NBONES; i++)
- m_bones[i] = DefaultBones[i];
- }
-
- float bone_skull = m_bones[(int)Bones.Skull].Offset.Z;
- float bone_head = m_bones[(int)Bones.Head].Offset.Z;
- float bone_neck = m_bones[(int)Bones.Neck].Offset.Z;
- float bone_chest = m_bones[(int)Bones.Chest].Offset.Z;
- float bone_torso = m_bones[(int)Bones.Torso].Offset.Z;
- float bone_hip = m_bones[(int)Bones.Hipright].Offset.Z;
- float bone_knee = m_bones[(int)Bones.KneeRight].Offset.Z;
- float bone_ank = m_bones[(int)Bones.AnkleRight].Offset.Z;
- float bone_foot = m_bones[(int)Bones.FootRight].Offset.Z;
-
- float sbone_skull = m_bones[(int)Bones.Skull].Scale.Z;
- float sbone_head = m_bones[(int)Bones.Head].Scale.Z;
- float sbone_neck = m_bones[(int)Bones.Neck].Scale.Z;
- float sbone_chest = m_bones[(int)Bones.Chest].Scale.Z;
- float sbone_torso = m_bones[(int)Bones.Torso].Scale.Z;
- float sbone_pelvis = m_bones[(int)Bones.Pelvis].Scale.Z;
- float sbone_hip = m_bones[(int)Bones.Hipright].Scale.Z;
- float sbone_knee = m_bones[(int)Bones.KneeRight].Scale.Z;
- float sbone_ank = m_bones[(int)Bones.AnkleRight].Scale.Z;
- float sbone_foot = m_bones[(int)Bones.FootRight].Scale.Z;
-
- float v_male = (m_visualParams[(int)VPElement.SHAPE_MALE] == 0) ? 0.0f : 1.0f;
- sbone_neck += v_male * 0.2f;
- sbone_chest += v_male * 0.05f;
- sbone_torso += v_male * 0.05f;
- sbone_knee += v_male * 0.1f;
-
- float v_height = convertVP(VPElement.SHAPE_HEIGHT) * 4.3f - 2.3f;
- sbone_neck += v_height * 0.02f;
- sbone_chest += v_height * 0.05f;
- sbone_torso += v_height * 0.05f;
- sbone_hip += v_height * 0.1f;
- sbone_knee += v_height * 0.1f;
-
- float v_hip_len = convertVP(VPElement.SHAPE_HIP_LENGTH) * 2f - 1f;
- sbone_pelvis += v_hip_len * 0.3f;
-
- float v_torso_len = convertVP(VPElement.SHAPE_TORSO_LENGTH) * 2f - 1f;
- sbone_torso += v_torso_len * 0.3f;
- sbone_pelvis += v_torso_len * 0.1f;
- sbone_hip += v_torso_len * -0.1f;
- sbone_knee += v_torso_len * -0.05f;
-
- float v_head_size = convertVP(VPElement.SHAPE_HEAD_SIZE) * 0.35f - 0.25f;
- bone_skull += v_head_size * 0.1f;
- sbone_skull += v_head_size;
- sbone_head += v_head_size;
-
- float v_shoes_heel = convertVP(VPElement.SHOES_HEEL_HEIGHT);
- bone_foot += v_shoes_heel * -0.08f;
-
- float v_shoes_plat = convertVP(VPElement.SHOES_PLATFORM_HEIGHT);
- bone_foot += v_shoes_plat * -0.07f;
-
- float v_leg_lenght = convertVP(VPElement.SHAPE_LEG_LENGTH) * 2f - 1f;
- sbone_hip += v_leg_lenght * 0.2f;
- sbone_knee += v_leg_lenght * 0.2f;
-
- float v_neck_len = convertVP(VPElement.SHAPE_NECK_LENGTH) * 2f - 1f;
- sbone_neck += v_neck_len * 0.5f;
-
- float hipmess = bone_hip * sbone_pelvis;
-
- float pelvisToFoot = hipmess -
- bone_knee * sbone_hip -
- bone_ank * sbone_knee -
- bone_foot * sbone_ank;
-
-
- float size = 1.4142f * bone_skull * sbone_head +
- bone_head * sbone_neck +
- bone_neck * sbone_chest +
- bone_chest * sbone_torso +
- bone_torso * sbone_pelvis;
-
- size += pelvisToFoot;
-
- m_standSize = new Vector3(0.45f, 0.6f, size);
- // m_feetOffset = 0.5f * size - pelvisToFoot;
- m_feetOffset = 0.0f;
- }
- }
-}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f686c60..c9b67de 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Framework
public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes);
- public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams);
+ public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 AvSize);
public delegate void StartAnim(IClientAPI remoteClient, UUID animID);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8e0b72f..2efaa79 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6248,6 +6248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Temporarily protect ourselves from the mantis #951 failure.
// However, we could do this for several other handlers where a failure isn't terminal
// for the client session anyway, in order to protect ourselves against bad code in plugins
+ Vector3 avSize = appear.AgentData.Size;
try
{
byte[] visualparams = new byte[appear.VisualParam.Length];
@@ -6258,7 +6259,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (appear.ObjectData.TextureEntry.Length > 1)
te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
- handlerSetAppearance(sender, te, visualparams);
+ handlerSetAppearance(sender, te, visualparams,avSize);
}
catch (Exception e)
{
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index d557a28..4c42397 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -145,6 +145,21 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
SetAppearance(sp, appearance.Texture, appearance.VisualParams);
}
+
+ public void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize)
+ {
+ float oldoff = sp.Appearance.AvatarFeetOffset;
+ Vector3 oldbox = sp.Appearance.AvatarBoxSize;
+
+ SetAppearance(sp, textureEntry, visualParams);
+ sp.Appearance.SetSize(avSize);
+
+ float off = sp.Appearance.AvatarFeetOffset;
+ Vector3 box = sp.Appearance.AvatarBoxSize;
+ if (oldoff != off || oldbox != box)
+ ((ScenePresence)sp).SetSize(box, off);
+ }
+
/// <summary>
/// Set appearance data (texture asset IDs and slider settings)
/// </summary>
@@ -181,13 +196,13 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0)
((ScenePresence)sp).SetHeight(sp.Appearance.AvatarHeight);
*/
- float oldoff = sp.Appearance.AvatarFeetOffset;
- Vector3 oldbox = sp.Appearance.AvatarBoxSize;
+// float oldoff = sp.Appearance.AvatarFeetOffset;
+// Vector3 oldbox = sp.Appearance.AvatarBoxSize;
changed = sp.Appearance.SetVisualParams(visualParams);
- float off = sp.Appearance.AvatarFeetOffset;
- Vector3 box = sp.Appearance.AvatarBoxSize;
- if(oldoff != off || oldbox != box)
- ((ScenePresence)sp).SetSize(box,off);
+// float off = sp.Appearance.AvatarFeetOffset;
+// Vector3 box = sp.Appearance.AvatarBoxSize;
+// if(oldoff != off || oldbox != box)
+// ((ScenePresence)sp).SetSize(box,off);
}
@@ -620,12 +635,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
/// <param name="client"></param>
/// <param name="texture"></param>
/// <param name="visualParam"></param>
- private void Client_OnSetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams)
+ private void Client_OnSetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize)
{
// m_log.WarnFormat("[AVFACTORY]: Client_OnSetAppearance called for {0} ({1})", client.Name, client.AgentId);
ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
if (sp != null)
- SetAppearance(sp, textureEntry, visualParams);
+ SetAppearance(sp, textureEntry, visualParams,avSize);
else
m_log.WarnFormat("[AVFACTORY]: Client_OnSetAppearance unable to find presence for {0}", client.AgentId);
}
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7602d6b..9dfccca 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3443,8 +3443,8 @@ namespace OpenSim.Region.Framework.Scenes
Name, Scene.RegionInfo.RegionName);
}
- if (Appearance.AvatarHeight == 0)
- Appearance.SetHeight();
+// if (Appearance.AvatarHeight == 0)
+// Appearance.SetHeight();
PhysicsScene scene = m_scene.PhysicsScene;
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index a31ccac..1b4ed1e 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -911,7 +911,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
// Mimicking LLClientView which gets always set appearance from client.
AvatarAppearance appearance;
m_scene.GetAvatarAppearance(this, out appearance);
- OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone());
+ OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(),appearance.AvatarSize);
}
public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 0caa521..260e1c6 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -201,7 +201,8 @@ namespace OpenSim.Services.Interfaces
appearance.Serial = Int32.Parse(Data["Serial"]);
if (Data.ContainsKey("AvatarHeight"))
- appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
+ appearance.SetSize(new Vector3(0.45f, 0.6f, float.Parse(Data["AvatarHeight"])));
+// appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
// Legacy Wearables
if (Data.ContainsKey("BodyItem"))
@@ -339,6 +340,7 @@ namespace OpenSim.Services.Interfaces
appearance.Wearables[AvatarWearable.EYES].Wear(
AvatarWearable.DefaultWearables[
AvatarWearable.EYES][0]);
+
}
catch
{
--
cgit v1.1