aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authoropensim mirror account2010-10-30 12:40:03 -0700
committeropensim mirror account2010-10-30 12:40:03 -0700
commite6a050f79ec47b87e34c3de371d044a77e629ad6 (patch)
tree913dc82ffae68db849aaa02c37b8464009f85f2d /OpenSim
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentFixed: ToAvatarAppearance wasn't retrieving the AvatarHeight. (diff)
downloadopensim-SC-e6a050f79ec47b87e34c3de371d044a77e629ad6.zip
opensim-SC-e6a050f79ec47b87e34c3de371d044a77e629ad6.tar.gz
opensim-SC-e6a050f79ec47b87e34c3de371d044a77e629ad6.tar.bz2
opensim-SC-e6a050f79ec47b87e34c3de371d044a77e629ad6.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Interfaces/IAvatarService.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 860a13b..d7af562 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -193,6 +193,9 @@ namespace OpenSim.Services.Interfaces
193 if (Data.ContainsKey("Serial")) 193 if (Data.ContainsKey("Serial"))
194 appearance.Serial = Int32.Parse(Data["Serial"]); 194 appearance.Serial = Int32.Parse(Data["Serial"]);
195 195
196 if (Data.ContainsKey("AvatarHeight"))
197 appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
198
196 // Legacy Wearables 199 // Legacy Wearables
197 if (Data.ContainsKey("BodyItem")) 200 if (Data.ContainsKey("BodyItem"))
198 appearance.Wearables[AvatarWearable.BODY].Wear( 201 appearance.Wearables[AvatarWearable.BODY].Wear(