summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum <none@none>2012-01-19 17:06:44 -0800
committercallum <none@none>2012-01-19 17:06:44 -0800
commit3e06171eff0cbddd99e3833d73c40937af346754 (patch)
treec41c28479de525aed788929ccdcd46ae2bbe0e2b /indra
parentc437c3b5b50fa05727435a37c37f79c34428d2a7 (diff)
EXP-1507 FIX Viewer 3 displays planar texture repeat values in Build floater asdouble
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelface.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index a4f6921f98..7301b305b2 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -875,8 +875,15 @@ void LLPanelFace::getState()
{
getChild<LLUICtrl>("TexScaleU")->setValue(2.0f * getChild<LLUICtrl>("TexScaleU")->getValue().asReal() );
getChild<LLUICtrl>("TexScaleV")->setValue(2.0f * getChild<LLUICtrl>("TexScaleV")->getValue().asReal() );
- }
+ // EXP-1507 (change label based on the mapping mode)
+ getChild<LLUICtrl>("rpt")->setValue(getString("string repeats per meter"));
+ }
+ else
+ if (selected_texgen == 0) // FIXME: should not be magic numbers
+ {
+ getChild<LLUICtrl>("rpt")->setValue(getString("string repeats per face"));
+ }
}
{