diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 5559d72d2b4b38652d6a126ffc793330e234ed15..982f0debcaa65bd9348d985e68aea75dc3d04e4e 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -261,7 +261,7 @@ BOOL LLPanelFace::postBuild() if(mCtrlColorTransp) { mCtrlColorTransp->setCommitCallback(boost::bind(&LLPanelFace::onCommitAlpha, this, _2)); - mCtrlColorTransp->setPrecision(0); + mCtrlColorTransp->setPrecision(3); mCtrlColorTransp->setFollowsTop(); mCtrlColorTransp->setFollowsLeft(); } @@ -418,7 +418,7 @@ void LLPanelFace::sendAlpha() { LLSpinCtrl* mCtrlColorTransp = getChild<LLSpinCtrl>("ColorTrans"); if(!mCtrlColorTransp)return; - F32 alpha = (100.f - mCtrlColorTransp->get()) / 100.f; + F32 alpha = mCtrlColorTransp->get(); LLSelectMgr::getInstance()->selectionSetAlphaOnly( alpha ); } @@ -879,7 +879,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/) // Color transparency getChildView("color trans")->setEnabled(editable); - F32 transparency = (1.f - color.mV[VALPHA]) * 100.f; + F32 transparency = color.mV[VALPHA]; getChild<LLUICtrl>("ColorTrans")->setValue(editable ? transparency : 0); getChildView("ColorTrans")->setEnabled(editable); diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 90f32ae4526b85e238b745cb279abbb6cf8f2c64..fca5e1c8d7f7af9513ea55c168cb58ae08961760 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -48,17 +48,17 @@ text_readonly_color="LabelDisabledColor" top="6" width="110"> - Transparency % + Transparency </text> <spinner - decimal_digits="0" + decimal_digits="3" follows="left|top" height="19" - increment="2" + increment="0.01" initial_value="0" layout="topleft" left_delta="0" - max_val="100" + max_val="1" name="ColorTrans" top_pad="4" width="80" /> @@ -76,7 +76,7 @@ Glow </text> <spinner - decimal_digits="2" + decimal_digits="3" follows="left|top" height="19" initial_value="0"