diff options
| author | McCabe Maxsted | 2009-10-12 05:58:22 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-12 05:58:22 -0700 |
| commit | 49dd4895cfdb396acc69e414ec3aaa8121fe2df9 (patch) | |
| tree | 522dfbee1fda240c51f4d876ad9cafa19ae0211d /linden/indra/newview | |
| parent | Added avatar shape import and export from Meerkat viewer (diff) | |
| download | meta-impy-49dd4895cfdb396acc69e414ec3aaa8121fe2df9.zip meta-impy-49dd4895cfdb396acc69e414ec3aaa8121fe2df9.tar.gz meta-impy-49dd4895cfdb396acc69e414ec3aaa8121fe2df9.tar.bz2 meta-impy-49dd4895cfdb396acc69e414ec3aaa8121fe2df9.tar.xz | |
Removed Emerald viewer modifier for avatar height label in customize window
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llfloatercustomize.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp index c542b37..3ae9666 100644 --- a/linden/indra/newview/llfloatercustomize.cpp +++ b/linden/indra/newview/llfloatercustomize.cpp | |||
| @@ -1312,10 +1312,9 @@ void LLScrollingPanelParam::onSliderMoved(LLUICtrl* ctrl, void* userdata) | |||
| 1312 | LLFloaterCustomize* floater_customize = gFloaterCustomize; | 1312 | LLFloaterCustomize* floater_customize = gFloaterCustomize; |
| 1313 | if (!floater_customize) return; | 1313 | if (!floater_customize) return; |
| 1314 | 1314 | ||
| 1315 | //KOWs avatar height stuff | 1315 | //avatar height stuff -Patrick Sapinski (Wednesday, August 19, 2009) |
| 1316 | LLVOAvatar* avatar = gAgent.getAvatarObject(); | 1316 | LLVOAvatar* avatar = gAgent.getAvatarObject(); |
| 1317 | F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.17; //mBodySize is actually quite a bit off. | 1317 | F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.17; //mBodySize is actually quite a bit off. |
| 1318 | avatar_size += (F32)99; //mBodySize is actually quite a bit off. | ||
| 1319 | 1318 | ||
| 1320 | floater_customize->getChild<LLTextBox>("HeightText")->setValue(llformat("%.2f", avatar_size) + "m"); | 1319 | floater_customize->getChild<LLTextBox>("HeightText")->setValue(llformat("%.2f", avatar_size) + "m"); |
| 1321 | floater_customize->getChild<LLTextBox>("HeightText2")->setValue(llformat("%.2f",llround(avatar_size / 0.3048)) + "'" | 1320 | floater_customize->getChild<LLTextBox>("HeightText2")->setValue(llformat("%.2f",llround(avatar_size / 0.3048)) + "'" |