Merge branch '1.2.0-avheight' into 1.2.0-customize

1 files changed, 28 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index b9deb6c..7d88a0f 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -1287,7 +1287,19 @@ void LLScrollingPanelParam::onSliderMoved(LLUICtrl* ctrl, void* userdata)
         F32 new_weight = self->percentToWeight( (F32)slider->getValue().asReal() );
         if (current_weight != new_weight )
         {
-                gAgent.getAvatarObject()->setVisualParamWeight( param, new_weight, TRUE);
+                LLFloaterCustomize* floater_customize = gFloaterCustomize;
+                if (!floater_customize) return;
+
+                //KOWs avatar height stuff
+                LLVOAvatar* avatar = gAgent.getAvatarObject();
+                F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.17; //mBodySize is actually quite a bit off.
+                avatar_size += (F32)99; //mBodySize is actually quite a bit off.
+                
+                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) + "\"");
+
+                gAgent.getAvatarObject()->setVisualParamWeight( param, new_weight, FALSE);
                 gAgent.getAvatarObject()->updateVisualParams();
         }
 }
@@ -2122,6 +2134,21 @@ void LLFloaterCustomize::draw()
         // arrives. Figure out some way to avoid this if possible.
         updateInventoryUI();
 
+        LLFloaterCustomize* floater_customize = gFloaterCustomize;
+        if (!floater_customize) return;
+
+        //KOWs avatar height stuff
+        LLVOAvatar* avatar = gAgent.getAvatarObject();
+        F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.17; //mBodySize is actually quite a bit off.
+                
+        floater_customize->getChild<LLTextBox>("HeightText")->setValue(llformat("%.2f", avatar_size) + "m");
+        //inches = avatar_size * 39.37
+        //round(inches) + inches % 12
+        std::string temp = llformat("%.0f",(F32)llfloor(avatar_size / 0.3048));
+        std::string temp2 = llformat("%.0f",(F32)(llround(avatar_size * 39.37) % 12));
+        floater_customize->getChild<LLTextBox>("HeightText2")->setValue(temp + "'"
+                                                                                                                                  + temp2 + "\"");
+
         LLScrollingPanelParam::sUpdateDelayFrames = 0;
         
         childSetEnabled("Save All",  isDirty() );