aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-12 05:58:22 -0700
committerMcCabe Maxsted2009-10-12 05:58:22 -0700
commit49dd4895cfdb396acc69e414ec3aaa8121fe2df9 (patch)
tree522dfbee1fda240c51f4d876ad9cafa19ae0211d
parentAdded avatar shape import and export from Meerkat viewer (diff)
downloadmeta-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
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llfloatercustomize.cpp3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index f71a3f7..d145415 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-10-12 McCabe Maxsted <hakushakukun@gmail.com> 12009-10-12 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * Removed Emerald viewer modifier for avatar height label in customize window.
4
5 modified: linden/indra/newview/llfloatercustomize.cpp
6
7
3 * Added avatar shape import and export from Meerkat viewer. 8 * Added avatar shape import and export from Meerkat viewer.
4 9
5 modified: linden/indra/newview/llfloatercustomize.cpp 10 modified: linden/indra/newview/llfloatercustomize.cpp
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)) + "'"