summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-11-01 23:10:05 +0000
committerJosh Bell <josh@lindenlab.com>2007-11-01 23:10:05 +0000
commit0f00eef21798520bcfe27ae03b3f1b2ae938ff13 (patch)
tree81c5b33e296d316a10a76c5a9e4cd09790aaa029 /indra/newview/llpanelface.cpp
parentef0eb8dbcf3980a057ad0864efa1c8e1575a8428 (diff)
svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
Diffstat (limited to 'indra/newview/llpanelface.cpp')
-rw-r--r--indra/newview/llpanelface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 63e25d9f2d..8dbe72fdfe 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -480,7 +480,7 @@ void LLPanelFace::getState()
{
F32 get(LLViewerObject* object, S32 face)
{
- return object->getTE(face)->mScaleS;
+ return object->getTE(face)->mScaleT;
}
} func;
identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, scale_t );