diff --git a/indra/newview/bdfloaterposecreator.cpp b/indra/newview/bdfloaterposecreator.cpp index 53769566f0aa2c0a9f27cc5dfbbc3380f28fc9e7..3653d0742248c652f3c56a3e31ff18ddfd473c1a 100644 --- a/indra/newview/bdfloaterposecreator.cpp +++ b/indra/newview/bdfloaterposecreator.cpp @@ -37,7 +37,6 @@ #include "llviewerjointattachment.h" #include "llviewerjoint.h" #include "llvoavatarself.h" -#include "llwindowwin32.h" #include "pipeline.h" #include "llviewerobjectlist.h" diff --git a/indra/newview/bdfloaterposer.cpp b/indra/newview/bdfloaterposer.cpp index 24139cf7285ed8f6e038bc79a83daa9bb14490a0..ed676e37fde2e43820f202ec7793ca1c10fe0328 100644 --- a/indra/newview/bdfloaterposer.cpp +++ b/indra/newview/bdfloaterposer.cpp @@ -37,7 +37,6 @@ #include "llviewerjointattachment.h" #include "llviewerjoint.h" #include "llvoavatarself.h" -#include "llwindowwin32.h" #include "pipeline.h" #include "llviewerobjectlist.h" @@ -781,8 +780,8 @@ void BDFloaterPoser::onJointControlsRefresh() mModifierTabs->selectTab(0); } //BD - Swap out of "Scale" and "Rotation" tabs when they are not available. - if (curr_idx == 2 && !mModifierTabs->getTabButtonEnabled(2) - || curr_idx == 0 && !mModifierTabs->getTabButtonEnabled(0)) + if ((curr_idx == 2 && !mModifierTabs->getTabButtonEnabled(2)) + || (curr_idx == 0 && !mModifierTabs->getTabButtonEnabled(0))) { mModifierTabs->selectTab(1); } @@ -885,7 +884,7 @@ void BDFloaterPoser::onJointSet(LLUICtrl* ctrl, const LLSD& param) S32 i = 0; while (i < 3) { - cell2[i]->setValue(ll_round(item->getColumn(i + 2)->getValue(), 0.001f)); + cell2[i]->setValue(ll_round((F32)item->getColumn(i + 2)->getValue().asReal(), 0.001f)); ++i; } }