livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some copypasta and add adjustable decimal precision to the other spinners in the face panel.

Cinders 2013-09-29 12:39:07 -06:00
parent b59645e521
commit 00d0f810c7
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llpanelface.cpp
View File

@ -218,7 +218,7 @@ BOOL LLPanelFace::postBuild()
{
mCtrlBumpyOffsetV->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyOffsetY, this);
}
mCtrlShinyOffsetU = getChild<LLSpinCtrl>("bumpyOffsetU");
mCtrlShinyOffsetU = getChild<LLSpinCtrl>("shinyOffsetU");
if (mCtrlShinyOffsetU)
{
mCtrlShinyOffsetU->setCommitCallback(&LLPanelFace::onCommitMaterialShinyOffsetX, this);
@ -238,11 +238,16 @@ BOOL LLPanelFace::postBuild()
{
mCtrlBumpyRot->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyRot, this);
}
mCtrlShinyRot = getChild<LLSpinCtrl>("TexRot");
mCtrlShinyRot = getChild<LLSpinCtrl>("shinyRot");
if (mCtrlShinyRot)
{
mCtrlShinyRot->setCommitCallback(&LLPanelFace::onCommitMaterialShinyRot, this);
}
mCtrlRpt = getChild<LLSpinCtrl>("rptctrl");
if (mCtrlRpt)
{
mCtrlRpt->setCommitCallback(LLPanelFace::onCommitRepeatsPerMeter, this);
}
changePrecision(gSavedSettings.getS32("FSBuildToolDecimalPrecision"));
// </FS>
@ -390,14 +395,6 @@ BOOL LLPanelFace::postBuild()
{
mCtrlGlow->setCommitCallback(LLPanelFace::onCommitGlow, this);
}
// <FS:CR>
mCtrlRpt = getChild<LLSpinCtrl>("rptctrl");
if (mCtrlRpt)
{
mCtrlRpt->setCommitCallback(LLPanelFace::onCommitRepeatsPerMeter, this);
}
// </FS:CR>
clearCtrls();
@ -2741,7 +2738,7 @@ void LLPanelFace::onCommitFlip(const LLUICtrl* ctrl, const LLSD& user_data)
void LLPanelFace::changePrecision(S32 decimal_precision)
{
if (decimal_precision < 0) decimal_precision = 0;
else if (decimal_precision > 10) decimal_precision = 9;
else if (decimal_precision > 9) decimal_precision = 9;
mCtrlTexScaleU->setPrecision(decimal_precision);
mCtrlTexScaleV->setPrecision(decimal_precision);
@ -2755,5 +2752,9 @@ void LLPanelFace::changePrecision(S32 decimal_precision)
mCtrlBumpyOffsetV->setPrecision(decimal_precision);
mCtrlShinyOffsetU->setPrecision(decimal_precision);
mCtrlShinyOffsetV->setPrecision(decimal_precision);
mCtrlTexRot->setPrecision(decimal_precision);
mCtrlBumpyRot->setPrecision(decimal_precision);
mCtrlShinyRot->setPrecision(decimal_precision);
mCtrlRpt->setPrecision(decimal_precision);
}
// </FS:CR>