OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

avinationmerge
ubit 2012-12-07 18:28:56 +01:00
parent 0a131bf9a7 b2f3516b68
commit 65e3bd93e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/AvatarAppearance.cs
View File

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