Merge branch 'master' of /var/git/opensim/

2010-10-30 12:40:03 -07:00 · 2010-10-30 12:40:03 -07:00 · e6a050f79e
parent 0ae4774ce5 48f6d47744
commit e6a050f79e
1 changed files with 3 additions and 0 deletions
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@ -193,6 +193,9 @@ namespace OpenSim.Services.Interfaces
                if (Data.ContainsKey("Serial"))
                    appearance.Serial = Int32.Parse(Data["Serial"]);

+                if (Data.ContainsKey("AvatarHeight"))
+                    appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
+
                // Legacy Wearables
                if (Data.ContainsKey("BodyItem"))
                    appearance.Wearables[AvatarWearable.BODY].Wear(