summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llpanelface.cpp4
-rwxr-xr-xindra/newview/llpanelface.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 51d1f82603..afc9d5b123 100755
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -951,7 +951,7 @@ void LLPanelFace::updateUI()
F32 spec_scale_s = 1.f;
F32 norm_scale_s = 1.f;
- LLSelectedTE::getOffsetS( diff_scale_s, identical_diff_scale_s);
+ LLSelectedTE::getScaleS( diff_scale_s, identical_diff_scale_s);
LLSelectedTEMaterial::getSpecularRepeatX( spec_scale_s, identical_spec_scale_s);
LLSelectedTEMaterial::getNormalRepeatX( norm_scale_s, identical_norm_scale_s);
@@ -990,7 +990,7 @@ void LLPanelFace::updateUI()
F32 spec_scale_t = 1.f;
F32 norm_scale_t = 1.f;
- LLSelectedTE::getOffsetT(diff_scale_t, identical_diff_scale_t);
+ LLSelectedTE::getScaleT(diff_scale_t, identical_diff_scale_t);
LLSelectedTEMaterial::getSpecularRepeatY(spec_scale_t, identical_spec_scale_t);
LLSelectedTEMaterial::getNormalRepeatY(norm_scale_t, identical_norm_scale_t);
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index d76d940d5c..8d267fe723 100755
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -447,6 +447,8 @@ private:
DEF_GET_TE_STATE(F32,F32,getRotation)
DEF_GET_TE_STATE(F32,F32,getOffsetS)
DEF_GET_TE_STATE(F32,F32,getOffsetT)
+ DEF_GET_TE_STATE(F32,F32,getScaleS)
+ DEF_GET_TE_STATE(F32,F32,getScaleT)
DEF_GET_TE_STATE(F32,F32,getGlow)
DEF_GET_TE_STATE(LLTextureEntry::e_texgen,LLTextureEntry::e_texgen,getTexGen)
DEF_GET_TE_STATE(LLColor4,const LLColor4&,getColor)