Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge

This commit is contained in:
Melanie
2011-10-11 22:15:25 +01:00
2 changed files with 7 additions and 1 deletions

View File

@@ -211,8 +211,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
// Process the visual params, this may change height as well
if (visualParams != null)
{
float oldHeight = sp.Appearance.AvatarHeight;
changed = sp.Appearance.SetVisualParams(visualParams);
if (sp.Appearance.AvatarHeight > 0)
if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0)
sp.SetHeight(sp.Appearance.AvatarHeight);
}