Improved accuracy of avatar height calculation.

Uses values from SNOW-197 as they seem more accurate.

(Plus some code cleanup and compile fixes from Jacek.)

2 files changed, 21 insertions, 10 deletions

diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index bfca034..4761491 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -1230,13 +1230,19 @@ void LLScrollingPanelParam::onSliderMoved(LLUICtrl* ctrl, void* userdata)
                 LLFloaterCustomize* floater_customize = gFloaterCustomize;
                 if (!floater_customize) return;
 
-                //avatar height stuff -Patrick Sapinski (Wednesday, August 19, 2009)
+                //avatar height stuff
+                // Use the values in SNOW-197 as they seem more accurate -- MC
                 LLVOAvatar* avatar = gAgent.getAvatarObject();
-                F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.17; //mBodySize is actually quite a bit off.
+                //mBodySize is actually quite a bit off.
+                F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.195;
+                int inches = (int)(avatar_size / .0254f); 
+                int feet = inches / 12; 
+                inches %= 12; 
                 
-                floater_customize->getChild<LLTextBox>("HeightText")->setValue(llformat("%.2f", avatar_size) + "m");
-                floater_customize->getChild<LLTextBox>("HeightText2")->setValue(llformat("%.2f",llround(avatar_size / 0.3048)) + "'"
-                                                                                                                                          + llformat("%.2f",llround(avatar_size * 39.37) % 12) + "\"");
+                floater_customize->getChild<LLTextBox>("HeightText")->\
+                        setValue(llformat("%.2f", avatar_size) + "m");
+                floater_customize->getChild<LLTextBox>("HeightText2")->\
+                        setValue(llformat("%.2f' %.2f\"", feet, inches));
 
                 gAgent.getAvatarObject()->setVisualParamWeight( param, new_weight, FALSE);
                 gAgent.getAvatarObject()->updateVisualParams();
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index b4710be..e947ecd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1115,24 +1115,29 @@ scratch and wear it.
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
      bottom="-400" drop_shadow_visible="true" follows="left|top"
      font="SansSerif" h_pad="0" halign="left" height="16"
-     left="8" mouse_opaque="true" name="AvatarHeightText" v_pad="0" width="140">
+     left="4" mouse_opaque="true" name="AvatarHeightText" v_pad="0" width="140">
     Avatar Height:
   </text>
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
      bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
      font="SansSerif" h_pad="0" halign="left" height="16"
-     left="8" mouse_opaque="true" name="HeightText" v_pad="0" width="140">
+     left="4" mouse_opaque="true" name="HeightText" v_pad="0" width="140">
     Avatar Height
   </text>
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
    bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
    font="SansSerif" h_pad="0" halign="left" height="16"
-   left="8" mouse_opaque="true" name="HeightText2" v_pad="0" width="140">
+   left="4" mouse_opaque="true" name="HeightText2" v_pad="0" width="140">
     Avatar Height2
   </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom_delta="-18" drop_shadow_visible="true" follows="right|bottom"
+         font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+         mouse_opaque="true" name="includes_shoes" v_pad="0" width="150">
+    (includes shoes)
+  </text>
 
-
-  <button name="Import" label="Import"
+    <button name="Import" label="Import"
           bottom="-536" left="10" height="20" width="70"
           follows="right|bottom" font="SansSerif" halign="center" />