Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-12-07 18:28:56 +01:00
commit 65e3bd93e9
1 changed files with 3 additions and 2 deletions

View File

@ -678,8 +678,8 @@ namespace OpenSim.Framework
{
if ((data != null) && (data["serial"] != null))
m_serial = data["serial"].AsInteger();
if ((data != null) && (data["height"] != null))
m_avatarHeight = (float)data["height"].AsReal();
// if ((data != null) && (data["height"] != null))
// m_avatarHeight = (float)data["height"].AsReal();
try
{
@ -741,6 +741,7 @@ namespace OpenSim.Framework
// att.ItemID, att.AssetID, att.AttachPoint);
}
}
SetHeight();
}
catch (Exception e)
{